Changeset 81279 in vbox

Timestamp:

Oct 15, 2019 7:03:11 AM (5 years ago)

Author:

vboxsync

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

133974

Message:

FE/Qt: bugref:6143. Correcting keyboard scaling as he show/hide multimedia keys.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• src/softkeyboard/UISoftKeyboard.cpp (modified) (3 diffs)
• xml/multimedia_keys.xml (modified) (1 diff)

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

@@ -2075 +2075 @@
     else
         m_fScaleFactorX = width() / (float) m_iInitialWidthNoNumPad;
-    m_fScaleFactorY = height() / (float) m_iInitialHeight;
+
+    if (!m_fHideMultimediaKeys)
+        m_fScaleFactorY = height() / (float) m_iInitialHeight;
+    else
+        m_fScaleFactorY = height() / (float)(m_iInitialHeight - m_multiMediaKeysLayout.totalHeight());
 
     QPainter painter(this);
@@ -2088 +2092 @@
     float fLedMargin =  0.6 * unitSize;
 
-
     UISoftKeyboardPhysicalLayout *pPhysicalLayout = findPhysicalLayout(m_pCurrentKeyboardLayout->physicalLayoutUuid());
     if (!pPhysicalLayout)
@@ -2130 +2133 @@
 
             m_pCurrentKeyboardLayout->drawTextInRect(key, painter);
-
+            /* Draw small LED like circles on the modifier/lock keys: */
             if (key.type() != KeyType_Ordinary)
             {

trunk/src/VBox/Frontends/VirtualBox/xml/multimedia_keys.xml ¶

@@ -151 +151 @@
         </key>
         <space>
-            <height>5</height>
+            <height>0</height>
         </space>
     </row>