Changeset 35744 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jan 27, 2011 4:31:07 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt4-OSX: fix todo for host key combos

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp

@@ -311 +311 @@
 
 #ifdef Q_WS_MAC
-    // TODO: To NaN: Please fix:
-//    /* Clear most of the modifiers: */
-//    m_darwinKeyModifiers &=
-//        alphaLock | kEventKeyModifierNumLockMask |
-//        (aReleaseHostKey ? 0 : ::DarwinKeyCodeToDarwinModifierMask(m_globalSettings.hostKey()));
+    unsigned int hostComboModifierMask = 0;
+    QList<int> hostCombo = UIHotKeyCombination::toKeyCodeList(m_globalSettings.hostCombo());
+    for (int i = 0; i < hostCombo.size(); ++i)
+        hostComboModifierMask |= ::DarwinKeyCodeToDarwinModifierMask(hostCombo.at(i));
+    /* Clear most of the modifiers: */
+    m_darwinKeyModifiers &=
+        alphaLock | kEventKeyModifierNumLockMask |
+        (aReleaseHostKey ? 0 : hostComboModifierMask);
 #endif