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

Timestamp:

Dec 18, 2023 2:22:41 PM (14 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10513: UIAdvancedSettingsDialog: Adjust UIFilterEditor internal geometry and layout; Make sure line-edit and tool-button located separately and frame is painted around their cumulative region.

File:

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

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

@@ -457 +457 @@
 
     /* Prepare base/frame painter path: */
-    const QRect widgetRect = m_pLineEdit->geometry();
+    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;
@@ -500 +501 @@
                                     background-color: rgba(255, 255, 255, 0%);\
                                     border: 0px none black;\
-                                    margin: 3px 10px 3px 10px;\
+                                    margin: 3px 0px 3px 10px;\
                                     }");
         m_pLineEdit->installEventFilter(this);
@@ -511 +512 @@
     if (m_pToolButton)
     {
-#ifdef VBOX_WS_MAC
-        setStyleSheet("QToolButton { border: 0px none black; margin: 0px 0px 0px 0px; } QToolButton::menu-indicator {image: none;}");
-#endif
+        m_pToolButton->setStyleSheet("QToolButton {\
+                                      border: 0px none black;\
+                                      margin: 0px 5px 0px 5px;\
+                                      }\
+                                      QToolButton::menu-indicator {\
+                                      image: none;\
+                                      }");
         m_pToolButton->hide();
         m_pToolButton->setIconSize(QSize(10, 10));
@@ -543 +548 @@
     const int iWidth = width();
 
-    /* Update filter editor geometry: */
+    /* Acquire filter editor size-hint: */
     const QSize esh = m_pLineEdit->minimumSizeHint();
     const int iMinimumEditorWidth = esh.width();
     const int iMinimumEditorHeight = esh.height();
-    /* Update minimum/maximum filter editor width: */
-    m_iUnfocusedEditorWidth = qMax(iWidth / 2, iMinimumEditorWidth);
-    m_iFocusedEditorWidth = qMax(iWidth, iMinimumEditorWidth);
-    m_pAnimation->update();
-    setEditorWidth(m_fFocused ? m_iFocusedEditorWidth : m_iUnfocusedEditorWidth);
-
-    /* Update filter button geometry: */
+    /* Acquire filter button size-hint: */
     const QSize bsh = m_pToolButton->minimumSizeHint();
     const int iMinimumButtonWidth = bsh.width();
     const int iMinimumButtonHeight = bsh.height();
+
+    /* Update filter button geo: */
+    const int iButtonX = iWidth - iMinimumButtonWidth;
     const int iButtonY = iMinimumEditorHeight > iMinimumButtonHeight
                        ? (iMinimumEditorHeight - iMinimumButtonHeight) / 2 + 1
                        : 0;
-    m_pToolButton->setGeometry(iWidth - iMinimumButtonWidth - 1, iButtonY, iMinimumButtonWidth, iMinimumButtonHeight);
-}
-
-void UIFilterEditor::setEditorWidth(int iWidth)
+    m_pToolButton->setGeometry(iButtonX, iButtonY, iMinimumButtonWidth, iMinimumButtonHeight);
+
+    /* Update minimum/maximum filter editor width: */
+    m_iUnfocusedEditorWidth = qMax(iWidth / 2 - iMinimumButtonWidth, iMinimumEditorWidth);
+    m_iFocusedEditorWidth = qMax(iWidth - iMinimumButtonWidth, iMinimumEditorWidth);
+    m_pAnimation->update();
+    setEditorWidth(m_fFocused ? m_iFocusedEditorWidth : m_iUnfocusedEditorWidth);
+}
+
+void UIFilterEditor::setEditorWidth(int iEditorWidth)
 {
     /* Align filter editor right: */
-    const int iX = width() - iWidth;
+    const int iX = m_pToolButton->x() - iEditorWidth;
     const int iY = 0;
-    const int iHeight = m_pLineEdit->minimumSizeHint().height();
+    const int iEditorHeight = m_pLineEdit->minimumSizeHint().height();
     const QRect oldGeo = m_pLineEdit->geometry();
-    m_pLineEdit->setGeometry(iX, iY, iWidth, iHeight);
+    m_pLineEdit->setGeometry(iX, iY, iEditorWidth, iEditorHeight);
     const QRect newGeo = m_pLineEdit->geometry();