Commit c34a9f9f authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt: fix F* keys in Preferences - #3827

KEY_F* are not sequential, while Qt::Key_F* are
Close #3827
(cherry picked from commit fe4a2f20)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 5ee65ac0
...@@ -275,7 +275,19 @@ static const vlc_qt_key_t keys[] = ...@@ -275,7 +275,19 @@ static const vlc_qt_key_t keys[] =
// Qt::Key_CapsLock // Qt::Key_CapsLock
// Qt::Key_NumLock // Qt::Key_NumLock
// Qt::Key_ScrollLock // Qt::Key_ScrollLock
/* F1 - F35 */ /* F1 - F35 - Qt goes to F35, VLC stops at F12 */
{ Qt::Key_F1, KEY_F1 },
{ Qt::Key_F2, KEY_F2 },
{ Qt::Key_F3, KEY_F3 },
{ Qt::Key_F4, KEY_F4 },
{ Qt::Key_F5, KEY_F5 },
{ Qt::Key_F6, KEY_F6 },
{ Qt::Key_F7, KEY_F7 },
{ Qt::Key_F8, KEY_F8 },
{ Qt::Key_F9, KEY_F9 },
{ Qt::Key_F10, KEY_F10 },
{ Qt::Key_F11, KEY_F11 },
{ Qt::Key_F12, KEY_F12 },
// Qt::Key_Super_L // Qt::Key_Super_L
// Qt::Key_Super_R // Qt::Key_Super_R
{ Qt::Key_Menu, KEY_MENU }, { Qt::Key_Menu, KEY_MENU },
...@@ -385,9 +397,6 @@ int qtEventToVLCKey( QKeyEvent *e ) ...@@ -385,9 +397,6 @@ int qtEventToVLCKey( QKeyEvent *e )
#else #else
# error FIXME # error FIXME
#endif #endif
else /* Qt and X11 go to F35, but VLC stops at F12 */
if( qtk >= Qt::Key_F1 && qtk <= Qt::Key_F12 )
i_vlck = qtk - Qt::Key_F1 + KEY_F1;
else else
{ {
const vlc_qt_key_t *map; const vlc_qt_key_t *map;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment