Changeset 81863 in vbox for trunk/src/VBox/Frontends

Timestamp:

Nov 15, 2019 8:34:43 AM (5 years ago)

Author:

vboxsync

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

134657

Message:

FE/Qt: bugref:6143

• Checking if extradata is there before trying to use it. This was crashing very nicely,
• Drawing key shapes with rounded corners.

File:

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

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

@@ -144 +144 @@
 };
 
+QPointF linearInterpolation(qreal t, const QPointF &p0, const QPointF &p1)
+{
+    if (t < 0)
+        return p0;
+    if (t> 1)
+        return p1;
+    return QPointF((1 - t) * p0 + t * p1);
+}
 
 /*********************************************************************************************************************************
@@ -425 +433 @@
     void press();
 
-    void setPolygon(const QPolygon &polygon);
-    const QPolygon &polygon() const;
-
-    QPolygon polygonInGlobal() const;
+    void setPoints(const QVector<QPointF> &points);
+    const QVector<QPointF> &points() const;
+    const QPainterPath &painterPath() const;
+
+    QPolygonF polygonInGlobal() const;
 
     int cutoutCorner() const;
@@ -440 +449 @@
 
     void updateState(bool fPressed);
+    void computePainterPath();
 
     QRect    m_keyGeometry;
-    /** Stores the key polygon in local coordinates. */
-    QPolygon m_polygon;
+    /** Stores the key points (vertices) in local coordinates. */
+    QVector<QPointF> m_points;
+    /** We cache the path since re-computing that at each draw is meaningless. */
+    QPainterPath m_painterPath;
     KeyType  m_enmType;
     KeyState m_enmState;
@@ -736 +748 @@
 
     bool parseXMLFile(const QString &strFileName, UISoftKeyboardPhysicalLayout &physicalLayout);
-    static QVector<QPoint> computeKeyVertices(const UISoftKeyboardKey &key);
+    static QVector<QPointF> computeKeyVertices(const UISoftKeyboardKey &key);
 
 private:
@@ -1680 +1692 @@
 }
 
-void UISoftKeyboardKey::setPolygon(const QPolygon &polygon)
-{
-    m_polygon = polygon;
-}
-
-const QPolygon &UISoftKeyboardKey::polygon() const
-{
-    return m_polygon;
-}
-
-QPolygon UISoftKeyboardKey::polygonInGlobal() const
-{
-    QPolygon globalPolygon(m_polygon);
+void UISoftKeyboardKey::setPoints(const QVector<QPointF> &points)
+{
+    m_points = points;
+    computePainterPath();
+}
+
+const QVector<QPointF> &UISoftKeyboardKey::points() const
+{
+    return m_points;
+}
+
+const QPainterPath &UISoftKeyboardKey::painterPath() const
+{
+    return m_painterPath;
+}
+
+void UISoftKeyboardKey::computePainterPath()
+{
+    if (m_points.size() < 3)
+        return;
+    double d = 0.1;
+    m_painterPath = QPainterPath(linearInterpolation(d, m_points[0], m_points[1]));
+    for (int i = 0; i < m_points.size(); ++i)
+    {
+        QPointF p0 = linearInterpolation(1-d, m_points[i], m_points[(i+1)%m_points.size()]);
+        QPointF p1 = linearInterpolation(d, m_points[(i+1)%m_points.size()], m_points[(i+2)%m_points.size()]);
+        m_painterPath.lineTo(p0);
+        m_painterPath.quadTo(m_points[(i+1)%m_points.size()], p1);
+    }
+}
+
+QPolygonF UISoftKeyboardKey::polygonInGlobal() const
+{
+    QPolygonF globalPolygon(m_points);
     globalPolygon.translate(m_keyGeometry.x(), m_keyGeometry.y());
     return globalPolygon;
@@ -2234 +2267 @@
                 painter.setPen(QPen(color(KeyboardColorType_Font), 2));
 
-            painter.drawPolygon(key.polygon());
+            /* Draw the key shape: */
+            painter.drawPath(key.painterPath());
 
             currentLayout.drawTextInRect(key, painter);
@@ -2552 +2586 @@
 void UISoftKeyboardWidget::setColorThemeByName(const QString &strColorThemeName)
 {
+    if (strColorThemeName.isEmpty())
+        return;
     if (m_currentColorTheme && m_currentColorTheme->name() == strColorThemeName)
         return;
@@ -2910 +2946 @@
 
             key.setKeyGeometry(QRect(iX, iY, key.width(), key.height()));
-            key.setPolygon(QPolygon(UIPhysicalLayoutReader::computeKeyVertices(key)));
+            key.setPoints(UIPhysicalLayoutReader::computeKeyVertices(key));
             key.setParentWidget(this);
             iX += key.width();
@@ -3332 +3368 @@
 }
 
-QVector<QPoint> UIPhysicalLayoutReader::computeKeyVertices(const UISoftKeyboardKey &key)
-{
-    QVector<QPoint> vertices;
+QVector<QPointF> UIPhysicalLayoutReader::computeKeyVertices(const UISoftKeyboardKey &key)
+{
+    QVector<QPointF> vertices;
 
     if (key.cutoutCorner() == -1 || key.width() <= key.cutoutWidth() || key.height() <= key.cutoutHeight())
@@ -4133 +4169 @@
     {
         QStringList colorTheme = gEDataManager->softKeyboardColorTheme();
-        /* The fist item is the theme name and the rest are color codes: */
-        QString strThemeName = colorTheme[0];
-        colorTheme.removeFirst();
-        m_pKeyboardWidget->colorsFromStringList(strThemeName, colorTheme);
+        if (!colorTheme.empty())
+        {
+            /* The fist item is the theme name and the rest are color codes: */
+            QString strThemeName = colorTheme[0];
+            colorTheme.removeFirst();
+            m_pKeyboardWidget->colorsFromStringList(strThemeName, colorTheme);
+        }
         m_pKeyboardWidget->setColorThemeByName(gEDataManager->softKeyboardSelectedColorTheme());
         m_pKeyboardWidget->setCurrentLayout(gEDataManager->softKeyboardSelectedLayout());
+
         /* Load other options from exra data: */
         bool fHideNumPad = false;
@@ -4146 +4186 @@
         m_pKeyboardWidget->setHideNumPad(fHideNumPad);
         m_pKeyboardWidget->setHideOSMenuKeys(fHideOSMenuKeys);
-       m_pKeyboardWidget->setHideMultimediaKeys(fHideMultimediaKeys);
+        m_pKeyboardWidget->setHideMultimediaKeys(fHideMultimediaKeys);
     }
 }