Changeset 90245 in vbox

Timestamp:

Jul 19, 2021 5:24:25 PM (4 years ago)

Author:

vboxsync

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

145784

Message:

FE/Qt:bugref:6143. Fixing a mouse over detection bug in numpad. Lock keys get green LED color.

File:

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

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

@@ -2312 +2312 @@
                 painter.translate(key.keyGeometry().x(), key.keyGeometry().y());
 
-            if (key.keyboardRegion() == KeyboardRegion_NumPad)
-                painter.translate(m_iBeforeNumPadWidth, 0);
-
             if(&key  == m_pKeyBeingEdited)
                 painter.setBrush(QBrush(color(KeyboardColorType_Edit)));
@@ -2335 +2332 @@
             {
                 QColor ledColor;
-                if (key.state() == KeyState_NotPressed)
-                    ledColor = color(KeyboardColorType_Font);
-                else if (key.state() == KeyState_Pressed)
-                    ledColor = QColor(0, 191, 204);
+                if (key.type() == KeyType_Lock)
+                {
+                    if (key.state() == KeyState_NotPressed)
+                        ledColor = color(KeyboardColorType_Font);
+                    else
+                        ledColor = QColor(0, 255, 0);
+                }
                 else
-                    ledColor = QColor(255, 50, 50);
+                {
+                    if (key.state() == KeyState_NotPressed)
+                        ledColor = color(KeyboardColorType_Font);
+                    else if (key.state() == KeyState_Pressed)
+                        ledColor = QColor(0, 191, 204);
+                    else
+                        ledColor = QColor(255, 50, 50);
+                }
                 if (m_enmMode == Mode_LayoutEdit)
                     ledColor = color(KeyboardColorType_Font);
@@ -2353 +2360 @@
             else
                 painter.translate(-key.keyGeometry().x(), -key.keyGeometry().y());
-            if (key.keyboardRegion() == KeyboardRegion_NumPad)
-                painter.translate(-m_iBeforeNumPadWidth, 0);
         }
     }
@@ -3012 +3017 @@
                 newPhysicalLayout->setLockKey(key.position(), &key);
 
-            key.setKeyGeometry(QRect(iX, iY, key.width(), key.height()));
+            if (key.keyboardRegion() == KeyboardRegion_NumPad)
+                key.setKeyGeometry(QRect(iX + m_iBeforeNumPadWidth, iY, key.width(), key.height()));
+            else
+                key.setKeyGeometry(QRect(iX, iY, key.width(), key.height()));
+
             key.setCornerRadius(0.1 * newPhysicalLayout->defaultKeyWidth());
             key.setPoints(UIPhysicalLayoutReader::computeKeyVertices(key));