Changeset 78669 in vbox for trunk/src/VBox

Timestamp:

May 22, 2019 5:00:37 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6143. Scaling the led indicator along side with the keyboard.

File:

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

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

@@ -125 +125 @@
     UIKeyType type() const;
 
+    void setScaleMultiplier(float fMultiplier);
+
     UIKeyState state() const;
     QVector<LONG> scanCodeWithPrefix() const;
-    void updateFontSize(float multiplier);
+    void updateFontSize();
 
     void release();
@@ -150 +152 @@
     UIKeyState m_enmState;
     QPalette     m_defaultPalette;
+    float     m_fScaleMultiplier;
 };
 
@@ -300 +303 @@
     , m_enmType(UIKeyType_SingleState)
     , m_enmState(UIKeyState_NotPressed)
+    , m_fScaleMultiplier(1.f)
 {
     m_iDefaultPointSize = font().pointSize();
@@ -356 +360 @@
 }
 
+void UISoftKeyboardKey::setScaleMultiplier(float fMultiplier)
+{
+    m_fScaleMultiplier = fMultiplier;
+}
+
 UIKeyState UISoftKeyboardKey::state() const
 {
@@ -361 +370 @@
 }
 
-void UISoftKeyboardKey::updateFontSize(float multiplier)
+void UISoftKeyboardKey::updateFontSize()
 {
     if (m_iDefaultPointSize != -1)
     {
         QFont newFont = font();
-        newFont.setPointSize(multiplier * m_iDefaultPointSize);
+        newFont.setPointSize(m_fScaleMultiplier * m_iDefaultPointSize);
         setFont(newFont);
     }
@@ -372 +381 @@
     {
         QFont newFont = font();
-        newFont.setPixelSize(multiplier * m_iDefaultPixelSize);
+        newFont.setPixelSize(m_fScaleMultiplier * m_iDefaultPixelSize);
         setFont(newFont);
     }
@@ -409 +418 @@
     int unitSize = qApp->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing);
 
-    float fRadius = 1.1 * unitSize;
-    float fSpace = unitSize;
+    float fRadius = m_fScaleMultiplier * 1.1 * unitSize;
+    float fSpace = m_fScaleMultiplier * unitSize;
     QRectF rectangle(fSpace, fSpace, fRadius, fRadius);
 
@@ -418 +427 @@
 void UISoftKeyboardKey::updateState(bool fPressed)
 {
+    if (m_enmType == UIKeyType_SingleState)
+        return;
     if (m_enmType == UIKeyType_TriState)
     {
@@ -496 +507 @@
             continue;
         pKey->setVisible(true);
-        pKey->updateFontSize(fMultiplier);
+        pKey->setScaleMultiplier(fMultiplier);
+        pKey->updateFontSize();
         int iKeyWidth = fMultiplier * pKey->width();
         if (i != m_keys.size() - 1)
@@ -592 +604 @@
     {
         UISoftKeyboardKey *pModifier = m_pressedModifiers[i];
+        if (pModifier->type() == UIKeyType_DualState)
+            continue;
         if (pModifier->scanCodePrefix() != 0)
             sequence << pModifier->scanCodePrefix();