Changeset 78682 in vbox for trunk/src/VBox

Timestamp:

May 23, 2019 9:30:36 AM (6 years ago)

Author:

vboxsync

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

130758

Message:

FE/Qt: bugref:6143. Making keeping the aspect ratio optional.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard

Files:

• UISoftKeyboard.cpp (modified) (9 diffs)
• UISoftKeyboard.h (modified) (1 diff)

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

@@ -169 +169 @@
     UISoftKeyboardRow(QWidget *pParent = 0);
     void updateLayout();
+    void setKeepAspectRatio(bool fKeepAspectRatio);
+
+    void setUnscaledWidth(int iWidth);
+    int unscaledWidth() const;
+
+    void setUnscaledHeight(int iWidth);
+    int unscaledHeight() const;
+
+    void addKey(UISoftKeyboardKey *pKey);
+
+private:
+
     int m_iWidth;
     int m_iHeight;
     QVector<UISoftKeyboardKey*> m_keys;
+    bool m_fKeepAspectRatio;
 };
 
@@ -491 +504 @@
     , m_iWidth(0)
     , m_iHeight(0)
-
-{
+    , m_fKeepAspectRatio(false)
+{
+}
+
+void UISoftKeyboardRow::setKeepAspectRatio(bool fKeepAspectRatio)
+{
+    m_fKeepAspectRatio = fKeepAspectRatio;
+}
+
+void UISoftKeyboardRow::setUnscaledWidth(int iWidth)
+{
+    m_iWidth = iWidth;
+}
+
+int UISoftKeyboardRow::unscaledWidth() const
+{
+    return m_iWidth;
+}
+
+void UISoftKeyboardRow::setUnscaledHeight(int iHeight)
+{
+    m_iHeight = iHeight;
+}
+
+int UISoftKeyboardRow::unscaledHeight() const
+{
+    return m_iHeight;
+}
+
+void UISoftKeyboardRow::addKey(UISoftKeyboardKey *pKey)
+{
+    m_keys.append(pKey);
 }
 
@@ -500 +543 @@
         return;
 
-    float fMultiplier = height() / (float)m_iHeight;
+
+    float fMultiplier = 1;
+    if (m_fKeepAspectRatio)
+        fMultiplier = height() / (float)m_iHeight;
+    else
+        fMultiplier = width() / (float)m_iWidth;
     int iX = 0;
     for (int i = 0; i < m_keys.size(); ++i)
@@ -538 +586 @@
     , m_iTotalRowHeight(0)
     , m_iMaxRowWidth(0)
+    , m_fKeepAspectRatio(false)
 {
     prepareObjects();
@@ -678 +727 @@
         UISoftKeyboardRow *pNewRow = new UISoftKeyboardRow(m_pContainerWidget);
         m_rows.push_back(pNewRow);
-        pNewRow->m_iHeight = layout.m_rows[i].m_iHeight;
+        pNewRow->setUnscaledHeight(layout.m_rows[i].m_iHeight);
+        pNewRow->setKeepAspectRatio(m_fKeepAspectRatio);
         m_iTotalRowHeight += layout.m_rows[i].m_iHeight;
-        pNewRow->m_iWidth = 0;
+        int iRowWidth = 0;
         for (int j = 0; j < layout.m_rows[i].m_keys.size(); ++j)
         {
             const SoftKeyboardKey &key = layout.m_rows[i].m_keys[j];
-            pNewRow->m_iWidth += key.m_iWidth;
-            pNewRow->m_iWidth += key.m_iSpaceAfter;
+            iRowWidth += key.m_iWidth;
+            iRowWidth += key.m_iSpaceAfter;
             UISoftKeyboardKey *pKey = new UISoftKeyboardKey(pNewRow);
             if (!pKey)
@@ -692 +742 @@
             connect(pKey, &UISoftKeyboardKey::released, this, &UISoftKeyboard::sltHandleKeyRelease);
             connect(pKey, &UISoftKeyboardKey::sigStateChanged, this, &UISoftKeyboard::sltHandleModifierStateChange);
-            pNewRow->m_keys.append(pKey);
+            pNewRow->addKey(pKey);
             pKey->setText(key.m_strLabel);
             pKey->setWidth(key.m_iWidth);
@@ -701 +751 @@
             pKey->hide();
         }
-        m_iMaxRowWidth = qMax(m_iMaxRowWidth, pNewRow->m_iWidth);
+        pNewRow->setUnscaledWidth(iRowWidth);
+        m_iMaxRowWidth = qMax(m_iMaxRowWidth, pNewRow->unscaledWidth());
     }
 }
@@ -713 +764 @@
     if (containerSize.width() == 0 || containerSize.height() == 0)
         return;
-    float fMultiplier = containerSize.width() / (float) m_iMaxRowWidth;
+
+    float fMultiplierX = containerSize.width() / (float) m_iMaxRowWidth;
+    float fMultiplierY = containerSize.height() / (float) m_iTotalRowHeight;
+    float fMultiplier = fMultiplierX;
 
     if (fMultiplier * m_iTotalRowHeight > containerSize.height())
-        fMultiplier = containerSize.height() / (float) m_iTotalRowHeight;
+        fMultiplier = fMultiplierY;
 
     int y = 0;
@@ -726 +780 @@
         if (!pRow)
             continue;
-        pRow->setGeometry(0, y, fMultiplier * pRow->m_iWidth, fMultiplier * pRow->m_iHeight);
-        pRow->setVisible(true);
-        y += fMultiplier * pRow->m_iHeight;
-        totalWidth += fMultiplier * pRow->m_iWidth;
-        totalHeight += fMultiplier * pRow->m_iHeight;
+        if(m_fKeepAspectRatio)
+        {
+            pRow->setGeometry(0, y, fMultiplier * pRow->unscaledWidth(), fMultiplier * pRow->unscaledHeight());
+            pRow->setVisible(true);
+            y += fMultiplier * pRow->unscaledHeight();
+            totalWidth += fMultiplier * pRow->unscaledWidth();
+            totalHeight += fMultiplier * pRow->unscaledHeight();
+        }
+        else
+        {
+            pRow->setGeometry(0, y, fMultiplierX * pRow->unscaledWidth(), fMultiplierY * pRow->unscaledHeight());
+            pRow->setVisible(true);
+            y += fMultiplierY * pRow->unscaledHeight();
+            totalWidth += fMultiplierX * pRow->unscaledWidth();
+            totalHeight += fMultiplierY * pRow->unscaledHeight();
+        }
         pRow->updateLayout();
     }
+    if (m_rows.size() > 0)
+        printf("row 0 width %d\n", m_rows[0]->size().width());
 }
 

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

@@ -85 +85 @@
     int           m_iMaxRowWidth;
     QVector<UISoftKeyboardKey*> m_pressedModifiers;
+    bool          m_fKeepAspectRatio;
 };