Take into an account SHIFT and CAPS LOCK being used at the same time

relates to #8098 If a user has active CAPS LOCK and uses SHIFT while typing, the letters must be non-capital.
ihhub · Dec 24, 2023 · 7db8058 · 7db8058
1 parent 05b1131
commit 7db8058
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/engine/localevent.cpp b/src/engine/localevent.cpp
@@ -340,8 +340,12 @@ namespace
         return modifier;
     }
 
-    char getCharacterFromPressedKey( const fheroes2::Key key, const int32_t mod )
+    char getCharacterFromPressedKey( const fheroes2::Key key, int32_t mod )
     {
+        if ( ( mod & fheroes2::KeyModifier::KEY_MODIFIER_SHIFT ) && ( mod & fheroes2::KeyModifier::KEY_MODIFIER_CAPS ) ) {
+            mod = mod & ~( fheroes2::KeyModifier::KEY_MODIFIER_SHIFT | fheroes2::KeyModifier::KEY_MODIFIER_CAPS );
+        }
+
         switch ( key ) {
         case fheroes2::Key::KEY_1:
             return ( fheroes2::KeyModifier::KEY_MODIFIER_SHIFT & mod ? '!' : '1' );