Changeset 102709 in vbox for trunk/src/VBox

Timestamp:

Dec 27, 2023 11:00:35 AM (14 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10513: UIAdvancedSettingsDialog: Fixes for UIFilterEditor stuff added in r160877; We wish to specify frame radius as well.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialog.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialog.cpp

@@ -177 +177 @@
 
     /** Returns painter path for the passed @a pathRect. */
-    QPainterPath cookPainterPath(const QRect &pathRect);
+    static QPainterPath cookPainterPath(const QRect &pathRect, int iRadius);
 
     /** Adjusts editor geometry. */
@@ -473 +473 @@
     const QRegion totalRegion = QRegion(m_pLineEdit->geometry()) + QRegion(m_pToolButton->geometry());
     QRect widgetRect = totalRegion.boundingRect();
-    const QPainterPath widgetPath = cookPainterPath(widgetRect);
+    const QPainterPath widgetPath = cookPainterPath(widgetRect, m_iRadius);
 
     /* Draw base/frame: */
@@ -546 +546 @@
 }
 
-QPainterPath UIFilterEditor::cookPainterPath(const QRect &pathRect)
+/* static */
+QPainterPath UIFilterEditor::cookPainterPath(const QRect &pathRect, int iRadius)
 {
     QPainterPath path;
-    const QSizeF arcSize(2 * m_iRadius, 2 * m_iRadius);
-    path.moveTo(pathRect.x() + m_iRadius, pathRect.y());
-    path.arcTo(QRectF(path.currentPosition(), arcSize).translated(-m_iRadius, 0), 90, 90);
-    path.lineTo(path.currentPosition().x(), path.currentPosition().y() + pathRect.height() - 2 * m_iRadius);
-    path.arcTo(QRectF(path.currentPosition(), arcSize).translated(0, -m_iRadius), 180, 90);
-    path.lineTo(path.currentPosition().x() + pathRect.width() - 2 * m_iRadius, path.currentPosition().y());
-    path.arcTo(QRectF(path.currentPosition(), arcSize).translated(-m_iRadius, -2 * m_iRadius), 270, 90);
-    path.lineTo(path.currentPosition().x(), path.currentPosition().y() - pathRect.height() + 2 * m_iRadius);
-    path.arcTo(QRectF(path.currentPosition(), arcSize).translated(-2 * m_iRadius, -m_iRadius), 0, 90);
+    const QSizeF arcSize(2 * iRadius, 2 * iRadius);
+    path.moveTo(pathRect.x() + iRadius, pathRect.y());
+    path.arcTo(QRectF(path.currentPosition(), arcSize).translated(-iRadius, 0), 90, 90);
+    path.lineTo(path.currentPosition().x(), path.currentPosition().y() + pathRect.height() - 2 * iRadius);
+    path.arcTo(QRectF(path.currentPosition(), arcSize).translated(0, -iRadius), 180, 90);
+    path.lineTo(path.currentPosition().x() + pathRect.width() - 2 * iRadius, path.currentPosition().y());
+    path.arcTo(QRectF(path.currentPosition(), arcSize).translated(-iRadius, -2 * iRadius), 270, 90);
+    path.lineTo(path.currentPosition().x(), path.currentPosition().y() - pathRect.height() + 2 * iRadius);
+    path.arcTo(QRectF(path.currentPosition(), arcSize).translated(-2 * iRadius, -iRadius), 0, 90);
     path.closeSubpath();
     return path;