Changeset 492

Timestamp:

Jan 29, 2010, 2:35:47 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Fixed: Numpad keys with numbers reported wrong key codes when Numpad is ON (#121).

File:

• trunk/src/gui/kernel/qkeymapper_pm.cpp (modified) (1 diff)

trunk/src/gui/kernel/qkeymapper_pm.cpp

@@ -641 +641 @@
     }
 
+    if ((state & Qt::KeypadModifier) && (chm.fs & KC_CHAR) &&
+        chm.vkey != VK_ENTER) {
+        // if it's a numpad key and it also provides a character, it means
+        // Numlock is on. According to other platforms, key code must be the
+        // character value in this case. Reset code to 0 to have it done so.
+        // Enter is an exception as it should always produce a virtual code.
+        if (chm.fs & KC_CHAR)
+            code = 0;
+    }
+
     // Note: code and/or chm.scancode may be zero here. We cannot ignore such
     // events because, for example, all non-ASCII letters have zero virtual