diff options
| author | Mario Roessel <mario.roessel@siemens.com> | 2023-03-01 11:37:57 +0100 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2023-04-20 06:14:58 +0000 |
| commit | 298c9509129cf039a1da75d5682cbe273a341590 (patch) | |
| tree | 57fba8c2bea64095c4e6e4bc2e9a8fa7d25996f1 /src/gui/platform | |
| parent | 936fe007ee97ebfcab5fda749bcbbf333744ca9e (diff) | |
QXkbCommon: set Qt::KeypadModifier when keypad button is pressed
Pick-to: 6.5
Task-number: QTBUG-111503
Done-With: Liang Qi <liang.qi@qt.io>
Change-Id: Ic7ca48ea8709d38aa83c95a9b5a7d39ff82f08c7
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/gui/platform')
| -rw-r--r-- | src/gui/platform/unix/qxkbcommon.cpp | 5 | ||||
| -rw-r--r-- | src/gui/platform/unix/qxkbcommon_p.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/gui/platform/unix/qxkbcommon.cpp b/src/gui/platform/unix/qxkbcommon.cpp index fafc566e32..cbc40ff118 100644 --- a/src/gui/platform/unix/qxkbcommon.cpp +++ b/src/gui/platform/unix/qxkbcommon.cpp @@ -562,7 +562,7 @@ static int keysymToQtKey_internal(xkb_keysym_t keysym, Qt::KeyboardModifiers mod return qtKey; } -Qt::KeyboardModifiers QXkbCommon::modifiers(struct xkb_state *state) +Qt::KeyboardModifiers QXkbCommon::modifiers(struct xkb_state *state, xkb_keysym_t keysym) { Qt::KeyboardModifiers modifiers = Qt::NoModifier; @@ -575,6 +575,9 @@ Qt::KeyboardModifiers QXkbCommon::modifiers(struct xkb_state *state) if (xkb_state_mod_name_is_active(state, XKB_MOD_NAME_LOGO, XKB_STATE_MODS_EFFECTIVE) > 0) modifiers |= Qt::MetaModifier; + if (keysym >= XKB_KEY_KP_Space && keysym <= XKB_KEY_KP_9) + modifiers |= Qt::KeypadModifier; + return modifiers; } diff --git a/src/gui/platform/unix/qxkbcommon_p.h b/src/gui/platform/unix/qxkbcommon_p.h index 5e4e635fa1..d27f965a81 100644 --- a/src/gui/platform/unix/qxkbcommon_p.h +++ b/src/gui/platform/unix/qxkbcommon_p.h @@ -51,7 +51,7 @@ public: static void xkbcommon_XConvertCase(xkb_keysym_t sym, xkb_keysym_t *lower, xkb_keysym_t *upper); static xkb_keysym_t qxkbcommon_xkb_keysym_to_upper(xkb_keysym_t ks); - static Qt::KeyboardModifiers modifiers(struct xkb_state *state); + static Qt::KeyboardModifiers modifiers(struct xkb_state *state, xkb_keysym_t keysym = XKB_KEY_VoidSymbol); static QList<int> possibleKeys(xkb_state *state, const QKeyEvent *event, bool superAsMeta = false, bool hyperAsMeta = false); |