Changeset 81944 in vbox

Timestamp:

Nov 18, 2019 3:38:57 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref: 6143. Making the corner radius a bit less magic numberish.

File:

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

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

@@ -154 +154 @@
         return QPointF();
     /* Normalize the vector and add it to starting point: */
-    vectorP0P1 = (fDistance /length) * vectorP0P1 + p0;
+    vectorP0P1 = (fDistance / length) * vectorP0P1 + p0;
     return vectorP0P1;
 }
@@ -189 +189 @@
 
 public:
+    UISoftKeyboardPhysicalLayout();
 
     void setName(const QString &strName);
@@ -205 +206 @@
     void updateLockKeyStates(bool fCapsLockState, bool fNumLockState, bool fScrollLockState);
     void reset();
+
+    void setDefaultKeyWidth(int iDefaultKeyWidth);
+    int defaultKeyWidth() const;
 
     /** Returns the sum totalHeight() of all rows(). */
@@ -216 +220 @@
     QString  m_strName;
     QVector<UISoftKeyboardRow>    m_rows;
+    int m_iDefaultKeyWidth;
     /** Scroll, Num, and Caps Lock keys' states are updated thru some API events. Thus we keep their pointers in a containter. */
     QMap<int, UISoftKeyboardKey*> m_lockKeys;
@@ -446 +451 @@
     const QPainterPath &painterPath() const;
 
+
+    void setCornerRadius(float fCornerRadius);
+
     QPolygonF polygonInGlobal() const;
 
@@ -494 +502 @@
       * and has precedence over the captions defined in keyboard layout files. */
     QString m_strStaticCaption;
-    bool m_fIsOSMenuKey;
+    bool    m_fIsOSMenuKey;
+    double  m_fCornerRadius;
 };
 
@@ -539 +548 @@
     QString baseCaption(int iKeyPosition) const;
     QString shiftCaption(int iKeyPosition) const;
+
     QString altGrCaption(int iKeyPosition) const;
     QString shiftAltGrCaption(int iKeyPosition) const;
@@ -545 +555 @@
     bool editedButNotSaved() const;
 
-    void setUid(const QUuid &uid);
+    void  setUid(const QUuid &uid);
     QUuid uid() const;
 
     void drawTextInRect(const UISoftKeyboardKey &key, QPainter &painter);
-
-
 
 private:
@@ -893 +901 @@
 *********************************************************************************************************************************/
 
+UISoftKeyboardPhysicalLayout::UISoftKeyboardPhysicalLayout()
+    :m_iDefaultKeyWidth(50)
+{
+}
+
 void UISoftKeyboardPhysicalLayout::setName(const QString &strName)
 {
@@ -943 +956 @@
     updateLockKeyState(fNumLockState, m_lockKeys.value(iNumLockPosition, 0));
     updateLockKeyState(fScrollLockState, m_lockKeys.value(iScrollLockPosition, 0));
+}
+
+void UISoftKeyboardPhysicalLayout::setDefaultKeyWidth(int iDefaultKeyWidth)
+{
+    m_iDefaultKeyWidth = iDefaultKeyWidth;
+}
+
+int UISoftKeyboardPhysicalLayout::defaultKeyWidth() const
+{
+    return m_iDefaultKeyWidth;
 }
 
@@ -1554 +1577 @@
     , m_enmKeyboardRegion(KeyboardRegion_Main)
     , m_fIsOSMenuKey(false)
+    , m_fCornerRadius(5.)
 {
 }
@@ -1734 +1758 @@
     if (m_points.size() < 3)
         return;
-    qreal fRadius = 5;
-    m_painterPath = QPainterPath(pointInBetween(fRadius, m_points[0], m_points[1]));
+
+    m_painterPath = QPainterPath(pointInBetween(m_fCornerRadius, m_points[0], m_points[1]));
     for (int i = 0; i < m_points.size(); ++i)
     {
-        QPointF p0 = pointInBetween(fRadius, m_points[(i+1)%m_points.size()], m_points[i]);
-        QPointF p1 = pointInBetween(fRadius, m_points[(i+1)%m_points.size()], m_points[(i+2)%m_points.size()]);
+        QPointF p0 = pointInBetween(m_fCornerRadius, m_points[(i+1)%m_points.size()], m_points[i]);
+        QPointF p1 = pointInBetween(m_fCornerRadius, 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);
     }
+}
+
+void UISoftKeyboardKey::setCornerRadius(float fCornerRadius)
+{
+    m_fCornerRadius = fCornerRadius;
 }
 
@@ -2249 +2278 @@
     int unitSize = qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin);
     float fLedRadius =  0.8 * unitSize;
-    float fLedMargin =  0.6 * unitSize;
+    float fLedMargin =  5;//0.6 * unitSize;
 
     UISoftKeyboardPhysicalLayout *pPhysicalLayout = findPhysicalLayout(currentLayout.physicalLayoutUuid());
@@ -2968 +2997 @@
 
             key.setKeyGeometry(QRect(iX, iY, key.width(), key.height()));
+            key.setCornerRadius(0.1 * newPhysicalLayout->defaultKeyWidth());
             key.setPoints(UIPhysicalLayoutReader::computeKeyVertices(key));
             key.setParentWidget(this);
@@ -3229 +3259 @@
     int iDefaultHeight = attributes.value("defaultHeight").toInt();
     QVector<UISoftKeyboardRow> &rows = physicalLayout.rows();
+    physicalLayout.setDefaultKeyWidth(iDefaultWidth);
 
     while (m_xmlReader.readNextStartElement())