Changeset 81125 in vbox for trunk/src/VBox

Timestamp:

Oct 7, 2019 10:21:24 AM (5 years ago)

Author:

vboxsync

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

133754

Message:

FE/Qt: bugref:6143. Replacing some flags with an enum.

File:

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

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

@@ -96 +96 @@
     KeyboardColorType_Pressed,
     KeyboardColorType_Max
+};
+
+enum KeyboardRegion
+{
+    KeyboardRegion_Main = 0,
+    KeyboardRegion_NumPad,
+    KeyboardRegion_Multimedia,
+    KeyboardRegion_OSMenu,
+    KeyboardRegion_Max
 };
 
@@ -349 +358 @@
     KeyType type() const;
 
-    void setIsNumPadKey(bool fIsNumPadKey);
-    bool isNumPadKey() const;
-
-    void setIsOSMenuKey(bool fIsOSMenuKey);
-    bool isOSMenuKey() const;
+    KeyboardRegion keyboardRegion() const;
+    void setKeyboardRegion(KeyboardRegion enmRegion);
 
     void setCutout(int iCorner, int iWidth, int iHeight);
@@ -408 +414 @@
     LONG m_iUsageId;
     LONG m_iUsagePage;
-    bool m_fIsNumPadKey;
-    bool m_fIsOSMenuKey;
+    KeyboardRegion m_enmKeyboardRegion;
 };
 
@@ -1433 +1438 @@
     , m_iPosition(0)
     , m_pParentWidget(0)
-    , m_fIsNumPadKey(false)
-    , m_fIsOSMenuKey(false)
-
+    , m_enmKeyboardRegion(KeyboardRegion_Main)
 {
 }
@@ -1535 +1538 @@
 }
 
-void UISoftKeyboardKey::setIsNumPadKey(bool fIsNumPadKey)
-{
-    m_fIsNumPadKey = fIsNumPadKey;
-}
-
-bool UISoftKeyboardKey::isNumPadKey() const
-{
-    return m_fIsNumPadKey;
-}
-
-void UISoftKeyboardKey::setIsOSMenuKey(bool fIsOSMenuKey)
-{
-    m_fIsOSMenuKey = fIsOSMenuKey;
-}
-
-bool UISoftKeyboardKey::isOSMenuKey() const
-{
-    return m_fIsOSMenuKey;
+KeyboardRegion UISoftKeyboardKey::keyboardRegion() const
+{
+    return m_enmKeyboardRegion;
+}
+
+void UISoftKeyboardKey::setKeyboardRegion(KeyboardRegion enmRegion)
+{
+    m_enmKeyboardRegion = enmRegion;
 }
 
@@ -2096 +2089 @@
         {
             UISoftKeyboardKey &key = keys[j];
-            if (m_fHideOSMenuKeys && key.isOSMenuKey())
+            if (m_fHideOSMenuKeys && key.keyboardRegion() == KeyboardRegion_OSMenu)
                 continue;
 
-            if (m_fHideNumPad &&key.isNumPadKey())
+            if (m_fHideNumPad && key.keyboardRegion() == KeyboardRegion_NumPad)
                 continue;
 
@@ -2647 +2640 @@
             for (int j = 0; j < row.keys().size(); ++j)
             {
-                row.keys()[j].setIsNumPadKey(true);
+                row.keys()[j].setKeyboardRegion(KeyboardRegion_NumPad);
             }
         }
         return true;
     }
-
+    /* Go thru all the keys row by row and construct their geometries: */
     int iY = m_iTopMargin;
     int iMaxWidth = 0;
@@ -2694 +2687 @@
                 iX += (m_iXSpacing + key.spaceWidthAfter());
 
-            if (!key.isNumPadKey())
+            if (key.keyboardRegion() != KeyboardRegion_NumPad)
             {
                 iXNoNumPad += key.width();
@@ -3062 +3055 @@
         {
             if (m_xmlReader.readElementText() == "true")
-                key.setIsOSMenuKey(true);
+                key.setKeyboardRegion(KeyboardRegion_OSMenu);
         }
         else