Changeset 79460 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jul 2, 2019 7:18:59 AM (6 years ago)

Author:

vboxsync

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

131717

Message:

FE/Qt: bugref:6143. Using dynamic font sizes for key captions

File:

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

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

@@ -443 +443 @@
 
     void drawText(int iKeyPosition, const QRect &keyGeometry, QPainter &painter);
+    void drawTextInRect(int iKeyPosition, const QRect &keyGeometry, QPainter &painter);
 
 private:
@@ -1648 +1649 @@
 {
     m_keyCapMap[iKeyPosition].m_strBase = strBaseCaption;
+    m_keyCapMap[iKeyPosition].m_strBase.replace("\\n", "\n");
 }
 
@@ -1701 +1703 @@
 {
     return m_uid;
+}
+
+void UISoftKeyboardLayout::drawTextInRect(int iKeyPosition, const QRect &keyGeometry, QPainter &painter)
+{
+    QFont painterFont(painter.font());
+    int iFontSize = 25;
+
+    const QString &strBaseCaption = baseCaption(iKeyPosition);
+    const QString &strShiftCaption = shiftCaption(iKeyPosition);
+
+    const QString &strShiftAltGrCaption = shiftAltGrCaption(iKeyPosition);
+    const QString &strAltGrCaption = altGrCaption(iKeyPosition);
+
+    const QString &strTopleftString = !strShiftCaption.isEmpty() ? strShiftCaption : strBaseCaption;
+    const QString &strBottomleftString = !strShiftCaption.isEmpty() ? strBaseCaption : QString();
+
+    do
+    {
+        painterFont.setPixelSize(iFontSize);
+        painterFont.setBold(true);
+        painter.setFont(painterFont);
+        QFontMetrics fontMetrics = painter.fontMetrics();
+        int iMargin = 0.25 * fontMetrics.width('X');
+
+        int iTextWidth = 2 * iMargin + qMax(fontMetrics.width(strTopleftString) + fontMetrics.width(strShiftAltGrCaption),
+                                            fontMetrics.width(strBottomleftString) + fontMetrics.width(strAltGrCaption));
+        int iTextHeight = 2 * iMargin + 2 * fontMetrics.height();
+
+        if (iTextWidth >= keyGeometry.width() || iTextHeight >= keyGeometry.height())
+            --iFontSize;
+        else
+            break;
+
+    }while(iFontSize > 1);
+
+
+    QFontMetrics fontMetrics = painter.fontMetrics();
+
+    int iMargin = 0.25 * fontMetrics.width('X');
+
+    QRect textRect(iMargin, iMargin,
+                   keyGeometry.width() - 2 * iMargin,
+                   keyGeometry.height() - 2 * iMargin);
+
+
+    painter.drawText(textRect, Qt::AlignLeft | Qt::AlignTop, strTopleftString);
+    painter.drawText(textRect, Qt::AlignLeft | Qt::AlignBottom, strBottomleftString);
+
+
+    // if (!strShiftCaption.isEmpty() && !strBaseCaption.isEmpty())
+    // {
+    //     painter.drawText(textRect, Qt::AlignLeft | Qt::AlignTop, strShiftCaption);
+    //     painter.drawText(textRect, Qt::AlignLeft | Qt::AlignBottom, strBaseCaption);
+    // }
+    // else
+    //     painter.drawText(textRect, Qt::AlignLeft | Qt::AlignTop, strBaseCaption);
+
+    painter.drawText(textRect, Qt::AlignRight | Qt::AlignTop, strShiftAltGrCaption);
+    painter.drawText(textRect, Qt::AlignRight | Qt::AlignBottom, strAltGrCaption);
+
 }
 
@@ -1895 +1957 @@
             painter.drawPolygon(key.polygon());
 
-            m_pCurrentKeyboardLayout->drawText(key.position(), key.keyGeometry(), painter);
+            //m_pCurrentKeyboardLayout->drawText(key.position(), key.keyGeometry(), painter);
+            m_pCurrentKeyboardLayout->drawTextInRect(key.position(), key.keyGeometry(), painter);
 
             if (key.type() != UIKeyType_Ordinary)