1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QXkbCommon: Use isKeypad() to replace duplicate logic

Browse Source 
This amends 298c9509129cf039a1da75d5682cbe273a341590 .

Pick-to: 6.5
Change-Id: I44696464817d6d3f6b1b3a7d005334805fb1cc38
Reviewed-by: Liang Qi <liang.qi@qt.io>
(cherry picked from commit c524ca342b0a00208eb2cdbe929276bc9785eb6b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Lu YaNing 2023-11-08 09:45:32 +08:00 committed by Qt Cherry-pick Bot
parent 71a0adc0c9
commit f514fba45b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/platform/unix/qxkbcommon.cpp
View File

@ -581,7 +581,7 @@ Qt::KeyboardModifiers QXkbCommon::modifiers(struct xkb_state *state, xkb_keysym_
if (xkb_state_mod_name_is_active(state, XKB_MOD_NAME_LOGO, XKB_STATE_MODS_EFFECTIVE) > 0) if (xkb_state_mod_name_is_active(state, XKB_MOD_NAME_LOGO, XKB_STATE_MODS_EFFECTIVE) > 0)
modifiers |= Qt::MetaModifier; modifiers |= Qt::MetaModifier;
if (keysym >= XKB_KEY_KP_Space && keysym <= XKB_KEY_KP_9) if (isKeypad(keysym))
modifiers |= Qt::KeypadModifier; modifiers |= Qt::KeypadModifier;
return modifiers; return modifiers;