Changeset 81881 in vbox

Timestamp:

Nov 15, 2019 3:56:25 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

134676

Message:

FE/Qt: bugref: 6143. Hiding OS/Menu keys.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp (modified) (7 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp

@@ -115 +115 @@
     KeyboardRegion_NumPad,
     KeyboardRegion_MultimediaKeys,
-    KeyboardRegion_OSMenuKeys,
     KeyboardRegion_Max
 };
@@ -437 +436 @@
     QVector<LONG> scanCodeWithPrefix() const;
 
+    void setIsOSMenuKey(bool fFlag);
+    bool isOSMenuKey() const;
+
     void release();
     void press();
@@ -492 +494 @@
       * and has precedence over the captions defined in keyboard layout files. */
     QString m_strStaticCaption;
+    bool m_fIsOSMenuKey;
 };
 
@@ -1550 +1553 @@
     , m_pParentWidget(0)
     , m_enmKeyboardRegion(KeyboardRegion_Main)
+    , m_fIsOSMenuKey(false)
 {
 }
@@ -1684 +1688 @@
 {
     m_pParentWidget = pParent;
+}
+
+void UISoftKeyboardKey::setIsOSMenuKey(bool fFlag)
+{
+    m_fIsOSMenuKey = fFlag;
+}
+
+bool UISoftKeyboardKey::isOSMenuKey() const
+{
+    return m_fIsOSMenuKey;
 }
 
@@ -2249 +2263 @@
             UISoftKeyboardKey &key = keys[j];
 
-            if (m_fHideOSMenuKeys && key.keyboardRegion() == KeyboardRegion_OSMenuKeys)
+            if (m_fHideOSMenuKeys && key.isOSMenuKey())
                 continue;
 
@@ -3316 +3330 @@
         {
             if (m_xmlReader.readElementText() == "true")
-                key.setKeyboardRegion(KeyboardRegion_OSMenuKeys);
+                key.setIsOSMenuKey(true);
         }
         else if (m_xmlReader.name() == "staticcaption")