Changeset 78606 in vbox for trunk/src

Timestamp:

May 20, 2019 6:35:15 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6143. Scaling the keyboard.

Location:

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

Files:

• UISoftKeyboard.cpp (modified) (7 diffs)
• UISoftKeyboard.h (modified) (2 diffs)

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

@@ -81 +81 @@
 
     UISoftKeyboardKey(QWidget *pParent = 0);
-    void setAspectRatio(float fRatio);
+    void setWidth(int iWidth);
+    int width() const;
+    void updateFontSize(float multiplier);
 
 protected:
 
-    virtual void resizeEvent(QResizeEvent *pEvent);
-
 private:
 
-    float m_fAspectRatio;
+    int m_iWidth;
+    int m_iDefaultPixelSize;
+    int m_iDefaultPointSize;
+};
+
+/*********************************************************************************************************************************
+*   UISoftKeyboardRow definition.                                                                                  *
+*********************************************************************************************************************************/
+
+class UISoftKeyboardRow : public QWidget
+{
+    Q_OBJECT;
+
+public:
+
+    UISoftKeyboardRow(QWidget *pParent = 0);
+    void updateLayout();
+    int m_iWidth;
+    int m_iHeight;
+    QVector<UISoftKeyboardKey*> m_keys;
 };
 
@@ -161 +180 @@
 UISoftKeyboardKey::UISoftKeyboardKey(QWidget *pParent /* = 0 */)
     :QPushButton(pParent)
-    , m_fAspectRatio(1.f)
-{
-}
-
-void UISoftKeyboardKey::setAspectRatio(float fRatio)
-{
-    m_fAspectRatio = fRatio;
-}
-
-void UISoftKeyboardKey::resizeEvent(QResizeEvent *pEvent)
-{
-    // QWidget::resize(qMin(pEvent->size().width(),pEvent->size().height()),
-    //                 qMin(pEvent->size().width(),pEvent->size().height()));
-
-    QPushButton::resizeEvent(pEvent);
-}
+    , m_iWidth(1)
+{
+    m_iDefaultPointSize = font().pointSize();
+    m_iDefaultPixelSize = font().pixelSize();
+}
+
+void UISoftKeyboardKey::setWidth(int iWidth)
+{
+    m_iWidth = iWidth;
+}
+
+int UISoftKeyboardKey::width() const
+{
+    return m_iWidth;
+}
+
+void UISoftKeyboardKey::updateFontSize(float multiplier)
+{
+    if (m_iDefaultPointSize != -1)
+    {
+        QFont newFont = font();
+        newFont.setPointSize(multiplier * m_iDefaultPointSize);
+        setFont(newFont);
+    }
+    else
+    {
+        QFont newFont = font();
+        newFont.setPixelSize(multiplier * m_iDefaultPixelSize);
+        setFont(newFont);
+    }
+}
+
+/*********************************************************************************************************************************
+*   UISoftKeyboardRow implementation.                                                                                  *
+*********************************************************************************************************************************/
+
+UISoftKeyboardRow::UISoftKeyboardRow(QWidget *pParent /* = 0 */)
+    :QWidget(pParent)
+    , m_iWidth(0)
+    , m_iHeight(0)
+
+{
+}
+
+void UISoftKeyboardRow::updateLayout()
+{
+    if (m_iHeight == 0)
+        return;
+
+    float fMultiplier = height() / (float)m_iHeight;
+    int iX = 0;
+    for (int i = 0; i < m_keys.size(); ++i)
+    {
+        UISoftKeyboardKey *pKey = m_keys[i];
+        if (!pKey)
+            continue;
+        pKey->setVisible(true);
+        pKey->updateFontSize(fMultiplier);
+        pKey->setGeometry(iX, 0, fMultiplier * pKey->width(), height());
+        iX += fMultiplier * pKey->width();
+    }
+}
+
 
 /*********************************************************************************************************************************
@@ -187 +253 @@
     :QIWithRetranslateUI<QWidget>(pParent)
     , m_pMainLayout(0)
-    , m_pContainerLayout(0)
+    , m_pContainerWidget(0)
     , m_pToolBar(0)
     , m_fShowToolbar(fShowToolbar)
     , m_strMachineName(strMachineName)
+    , m_iTotalRowHeight(0)
+    , m_iMaxRowWidth(0)
 {
     prepareObjects();
@@ -212 +280 @@
 {
     QIWithRetranslateUI<QWidget>::resizeEvent(pEvent);
+    updateLayout();
 }
 
@@ -222 +291 @@
     if (!m_pMainLayout)
         return;
-    QWidget *pContainerWidget = new QWidget;
-    if (!pContainerWidget)
-        return;
-    pContainerWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
-    pContainerWidget->setStyleSheet("background-color:red;");
-
-    m_pMainLayout->addWidget(pContainerWidget);
-
-    m_pContainerLayout = new QVBoxLayout;
-    m_pContainerLayout->setSpacing(0);
-    pContainerWidget->setLayout(m_pContainerLayout);
-
-    /* Configure layout: */
-
+    m_pContainerWidget = new QWidget;
+    if (!m_pContainerWidget)
+        return;
+    m_pContainerWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+    //m_pContainerWidget->setStyleSheet("background-color:red;");
+    //m_pContainerWidget->setAutoFillBackground(false);
+
+    m_pMainLayout->addWidget(m_pContainerWidget);
 }
 
@@ -256 +319 @@
 void UISoftKeyboard::parseLayout()
 {
-    if (!m_pContainerLayout)
-        return;
-
     UIKeyboardLayoutReader reader;
     SoftKeyboardLayout layout;
@@ -264 +324 @@
         return;
 
+    m_iTotalRowHeight = 0;
+    m_iMaxRowWidth = 0;
+    qDeleteAll(m_rows);
+    m_rows.clear();
+
     for (int i = 0; i < layout.m_rows.size(); ++i)
     {
-        QHBoxLayout *pRowLayout = new QHBoxLayout;
-        pRowLayout->setSpacing(0);
+        UISoftKeyboardRow *pNewRow = new UISoftKeyboardRow(m_pContainerWidget);
+        if ( i == 0)
+            pNewRow->setStyleSheet("background-color:yellow;");
+        else
+            pNewRow->setStyleSheet("background-color:green;");
+
+        m_rows.push_back(pNewRow);
+        pNewRow->m_iHeight = layout.m_rows[i].m_iHeight;
+        m_iTotalRowHeight += layout.m_rows[i].m_iHeight;
+        pNewRow->m_iWidth = 0;
         for (int j = 0; j < layout.m_rows[i].m_keys.size(); ++j)
         {
-            UISoftKeyboardKey *pKey = new UISoftKeyboardKey;
-            pRowLayout->addWidget(pKey);
-            //m_pContainerLayout->addWidget(pKey, i, j);
-            //pKey->setFixedSize(layout.m_rows[i].m_keys[j].m_iWidth, layout.m_rows[i].m_iHeight);
+            pNewRow->m_iWidth += layout.m_rows[i].m_keys[j].m_iWidth;
+            UISoftKeyboardKey *pKey = new UISoftKeyboardKey(pNewRow);
+            pNewRow->m_keys.append(pKey);
             pKey->setText(layout.m_rows[i].m_keys[j].m_strLabel);
-            //if (j != 3)
-
-
-            // else
-            //m_pContainerLayout->setColumnStretch(j, 0);
-            //m_pContainerLayout->addSpacing(2);
-            // QSpacerItem *pSpacer = new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
-            // m_pContainerLayout->addItem(pSpacer);
+            pKey->setWidth(layout.m_rows[i].m_keys[j].m_iWidth);
+            pKey->hide();
         }
-        //pRowLayout->addStretch(1);
-        //m_pContainerLayout->setColumnStretch(layout.m_rows[i].m_keys.size()-1, 1);
-        m_pContainerLayout->addLayout(pRowLayout);
-    }
+        m_iMaxRowWidth = qMax(m_iMaxRowWidth, pNewRow->m_iWidth);
+    }
+    printf("total height %d %d\n", m_iTotalRowHeight, m_iMaxRowWidth);
+
+
+//     return;
+//     for (int i = 0; i < layout.m_rows.size(); ++i)
+//     {
+//         QHBoxLayout *pRowLayout = new QHBoxLayout;
+//         pRowLayout->setSpacing(0);
+//         for (int j = 0; j < layout.m_rows[i].m_keys.size(); ++j)
+//         {
+//             UISoftKeyboardKey *pKey = new UISoftKeyboardKey;
+//             pRowLayout->addWidget(pKey);
+
+//             //m_pContainerLayout->addWidget(pKey, i, j);
+//             //pKey->setFixedSize(layout.m_rows[i].m_keys[j].m_iWidth, layout.m_rows[i].m_iHeight);
+//             pKey->setText(layout.m_rows[i].m_keys[j].m_strLabel);
+//             //if (j != 3)
+
+
+//             // else
+//             //m_pContainerLayout->setColumnStretch(j, 0);
+//             //m_pContainerLayout->addSpacing(2);
+//             // QSpacerItem *pSpacer = new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
+//             // m_pContainerLayout->addItem(pSpacer);
+//         }
+//         //pRowLayout->addStretch(1);
+//         //m_pContainerLayout->setColumnStretch(layout.m_rows[i].m_keys.size()-1, 1);
+//         m_pContainerLayout->addLayout(pRowLayout);
+//     }
+}
+
+void UISoftKeyboard::updateLayout()
+{
+    if (!m_pContainerWidget)
+        return;
+
+    QSize containerSize(m_pContainerWidget->size());
+    if (containerSize.width() == 0 || containerSize.height() == 0)
+        return;
+    float fMultiplier = containerSize.width() / (float) m_iMaxRowWidth;
+
+    if (fMultiplier * m_iTotalRowHeight > containerSize.height())
+        fMultiplier = containerSize.height() / (float) m_iTotalRowHeight;
+
+    int y = 0;
+    for (int i = 0; i < m_rows.size(); ++i)
+    {
+        UISoftKeyboardRow *pRow = m_rows[i];
+        if (!pRow)
+            continue;
+        pRow->setGeometry(0, y, fMultiplier * pRow->m_iWidth, fMultiplier * pRow->m_iHeight);
+        pRow->setVisible(true);
+        y += fMultiplier * pRow->m_iHeight;
+        // pRow->setAutoFillBackground(true);
+        // pRow->raise();
+
+        pRow->updateLayout();
+
+        // m_pContainerWidget->lower();
+        // pRow->update();
+
+    }
+    update();
+    /* Compute the size multiplier: */
+
 }
 

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

@@ -36 +36 @@
 /* Forward declarations: */
 class UISoftKeyboardKey;
+class UISoftKeyboardRow;
 class QHBoxLayout;
 class QVBoxLayout;
@@ -66 +67 @@
     void loadSettings();
     void parseLayout();
+    void updateLayout();
 
     QHBoxLayout   *m_pMainLayout;
-    QVBoxLayout   *m_pContainerLayout;
+    QWidget       *m_pContainerWidget;
     UIToolBar     *m_pToolBar;
     const bool    m_fShowToolbar;
     QString       m_strMachineName;
-    QVector<UISoftKeyboardKey*> m_keys;
+    QVector<UISoftKeyboardRow*> m_rows;
+    int           m_iTotalRowHeight;
+    int           m_iMaxRowWidth;
 };