Changeset 81268 in vbox

Timestamp:

Oct 14, 2019 6:11:11 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6143. Compansating for the height as we hide multimedia pad.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

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

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

@@ -171 +171 @@
     void updateLockKeyStates(bool fCapsLockState, bool fNumLockState, bool fScrollLockState);
     void reset();
+
+    /** Returns the sum totalHeight() of all rows(). */
+    int totalHeight() const;
 
 private:
@@ -319 +322 @@
     int defaultHeight() const;
 
-    int MaximumHeight() const;
+    /* Return the sum of the maximum key height and m_iSpaceHeightAfter */
+    int totalHeight() const;
 
     QVector<UISoftKeyboardKey> &keys();
@@ -335 +339 @@
     int m_iDefaultWidth;
     int m_iDefaultHeight;
-    int m_iMaximumHeight;
 
     QVector<UISoftKeyboardKey> m_keys;
@@ -871 +874 @@
         }
     }
+}
+
+int UISoftKeyboardPhysicalLayout::totalHeight() const
+{
+    int iHeight = 0;
+    for (int i = 0; i < m_rows.size(); ++i)
+        iHeight += m_rows[i].totalHeight();
+    return iHeight;
 }
 
@@ -1398 +1409 @@
 }
 
+int UISoftKeyboardRow::totalHeight() const
+{
+    int iMaxHeight = 0;
+    for (int i = 0; i < m_keys.size(); ++i)
+        iMaxHeight = qMax(iMaxHeight, m_keys[i].height());
+    return iMaxHeight + m_iSpaceHeightAfter;
+}
+
 void UISoftKeyboardRow::setDefaultHeight(int iHeight)
 {
@@ -2091 +2110 @@
                 continue;
 
-            painter.translate(key.keyGeometry().x(), key.keyGeometry().y());
+            if (m_fHideMultimediaKeys)
+                painter.translate(key.keyGeometry().x(), key.keyGeometry().y() - m_multiMediaKeysLayout.totalHeight());
+            else
+                painter.translate(key.keyGeometry().x(), key.keyGeometry().y());
 
             if(&key  == m_pKeyBeingEdited)
@@ -2126 +2148 @@
                 painter.drawEllipse(rectangle);
             }
-            painter.translate(-key.keyGeometry().x(), -key.keyGeometry().y());
+            if (m_fHideMultimediaKeys)
+                painter.translate(-key.keyGeometry().x(), -key.keyGeometry().y() + m_multiMediaKeysLayout.totalHeight());
+            else
+                painter.translate(-key.keyGeometry().x(), -key.keyGeometry().y());
+
         }
     }
@@ -3853 +3879 @@
         m_pKeyboardWidget->setHideNumPad(fHideNumPad);
         m_pKeyboardWidget->setHideOSMenuKeys(fHideOSMenuKeys);
+       m_pKeyboardWidget->setHideMultimediaKeys(fHideMultimediaKeys);
     }
 }

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

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