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

Timestamp:

Dec 27, 2023 10:08:20 AM (12 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10513: UIAdvancedSettingsDialog: Separate method in UIFilterEditor to prepare painter path for the rect specified.

File:

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

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

@@ -176 +176 @@
     void cleanup();
 
+    /** Returns painter path for the passed @a pathRect. */
+    QPainterPath cookPainterPath(const QRect &pathRect);
+
     /** Adjusts editor geometry. */
     void adjustEditorGeometry();
@@ -469 +472 @@
     /* Prepare base/frame painter path: */
     const QRegion totalRegion = QRegion(m_pLineEdit->geometry()) + QRegion(m_pToolButton->geometry());
-    const QRect widgetRect = totalRegion.boundingRect();
-    const QSizeF arcSize(2 * m_iRadius, 2 * m_iRadius);
-    QPainterPath path;
-    path.moveTo(widgetRect.x() + m_iRadius, widgetRect.y());
-    path.arcTo(QRectF(path.currentPosition(), arcSize).translated(-m_iRadius, 0), 90, 90);
-    path.lineTo(path.currentPosition().x(), path.currentPosition().y() + widgetRect.height() - 2 * m_iRadius);
-    path.arcTo(QRectF(path.currentPosition(), arcSize).translated(0, -m_iRadius), 180, 90);
-    path.lineTo(path.currentPosition().x() + widgetRect.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() - widgetRect.height() + 2 * m_iRadius);
-    path.arcTo(QRectF(path.currentPosition(), arcSize).translated(-2 * m_iRadius, -m_iRadius), 0, 90);
-    path.closeSubpath();
+    QRect widgetRect = totalRegion.boundingRect();
+    const QPainterPath widgetPath = cookPainterPath(widgetRect);
 
     /* Draw base/frame: */
-    painter.fillPath(path, colorBase);
-    painter.strokePath(path, colorFrame);
+    painter.fillPath(widgetPath, colorBase);
+    painter.strokePath(widgetPath, colorFrame);
 }
 
@@ -551 +544 @@
     delete m_pAnimation;
     m_pAnimation = 0;
+}
+
+QPainterPath UIFilterEditor::cookPainterPath(const QRect &pathRect)
+{
+    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);
+    path.closeSubpath();
+    return path;
 }