Changeset 107

Timestamp:

Jul 29, 2006, 4:22:12 PM (19 years ago)

Author:

dmik

Message:

Widgets: Fixed: Pressed key's text (symbol) is now always uppercased if pressed with a modifier key before matching against UNICODE_ACCEL accelerators (to let them be independent of the Shift state). As a result, pressing Alt+NLS_letter wil now match the accelerator defined using the "w&ord" syntax (where Qt always uppercases the indicated letter) regardless of the Shift state.

File:

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

trunk/src/kernel/qaccel.cpp

@@ -311 +311 @@
     }
     if ( !e->text().isEmpty() ) {
-        temp.setKey( (int)e->text()[0].unicode() | UNICODE_ACCEL | modifier, index );
+        QChar c = e->text()[0];
+        // be in accordance with accoQAccel::shortcutKey()
+        if ( modifier != 0 && c.isPrint() )
+            c = c.upper();
+        temp.setKey( (int)c.unicode() | UNICODE_ACCEL | modifier, index );
         result = temp.matches( item->key );
     }