diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-27 05:18:20 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-27 05:18:20 +0200 |
| commit | 86df1eb3f75fcc28d215bb0e42844b95a31a1f29 (patch) | |
| tree | 823bc1e45381bf9fb471af69afe253dd3a6c6295 /opentrack | |
| parent | 9ba6eda74d046b32f2541fbab46b7a905249b6ac (diff) | |
| parent | 7d4abcf53b63c543721017d5cf787d5b689a8174 (diff) | |
Merge branch 'unstable' into trackhat-ui
Diffstat (limited to 'opentrack')
| -rwxr-xr-x[-rw-r--r--] | opentrack/win32-shortcuts.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/opentrack/win32-shortcuts.cpp b/opentrack/win32-shortcuts.cpp index dbf4f9fd..67f71f41 100644..100755 --- a/opentrack/win32-shortcuts.cpp +++ b/opentrack/win32-shortcuts.cpp @@ -109,6 +109,7 @@ QList<win_key> windows_key_sequences = win_key(DIK_Z, Qt::Key::Key_Z ), win_key(DIK_RETURN, Qt::Key::Key_Return), win_key(DIK_INSERT, Qt::Key::Key_Insert), + win_key(DIK_SPACE, Qt::Key::Key_Space), }); bool win_key::from_qt(QKeySequence qt_, int& dik, Qt::KeyboardModifiers& mods) @@ -118,7 +119,7 @@ bool win_key::from_qt(QKeySequence qt_, int& dik, Qt::KeyboardModifiers& mods) #ifdef _WIN32 const auto our_mods_ = our_mods; our_mods |= Qt::ShiftModifier; - switch (qt & ~Qt::ShiftModifier) + switch (qt & ~Qt::KeyboardModifierMask) { case Qt::Key::Key_BraceLeft: qt = Qt::Key::Key_BracketLeft; break; case Qt::Key::Key_BraceRight: qt = Qt::Key::Key_BracketRight; break; |