Changeset 102711 in vbox for trunk/src

Timestamp:

Dec 27, 2023 11:07:54 AM (13 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10513: macOS: UIAdvancedSettingsDialog: Improvement for UIFilterEditor; Emulate cocoa focus ring around focused search field.

File:

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

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

@@ -428 +428 @@
             m_fFocused = true;
             emit sigFocused();
+            update();
             break;
         /* Backward animation on focus-out: */
@@ -433 +434 @@
             m_fFocused = false;
             emit sigUnfocused();
+            update();
             break;
         default:
@@ -463 +465 @@
     const bool fActive = window() && window()->isActiveWindow();
     const QPalette::ColorGroup enmColorGroup = fActive ? QPalette::Active : QPalette::Inactive;
+#ifdef VBOX_WS_MAC
+    const QColor colorHighlight = uiCommon().isInDarkMode()
+                                ? qApp->palette().color(enmColorGroup, QPalette::Highlight).lighter(110)
+                                : qApp->palette().color(enmColorGroup, QPalette::Highlight).darker(110);
+#endif
     const QColor colorBase = qApp->palette().color(enmColorGroup, QPalette::Base);
     const QColor colorFrame = uiCommon().isInDarkMode()
@@ -471 +478 @@
     const QRegion totalRegion = QRegion(m_pLineEdit->geometry()) + QRegion(m_pToolButton->geometry());
     QRect widgetRect = totalRegion.boundingRect();
+#ifdef VBOX_WS_MAC
+    const QRect focusRect = widgetRect;
+    widgetRect.adjust(3, 3, -3, -3);
+    const QPainterPath focusPath = cookPainterPath(focusRect, m_iRadius + 2);
+#endif
     const QPainterPath widgetPath = cookPainterPath(widgetRect, m_iRadius);
 
     /* Draw base/frame: */
+#ifdef VBOX_WS_MAC
+    if (m_pLineEdit->hasFocus())
+        painter.fillPath(focusPath, colorHighlight);
+#endif
     painter.fillPath(widgetPath, colorBase);
     painter.strokePath(widgetPath, colorFrame);
@@ -498 +514 @@
     if (m_pLineEdit)
     {
+#ifdef VBOX_WS_MAC
+        /* A bit of magic to be able to replace the frame.
+         * Disable border, adjust margins and make background transparent.
+                 * Left and right margins also take focus ring into account. */
+        m_pLineEdit->setStyleSheet("QLineEdit {\
+                                    background-color: rgba(255, 255, 255, 0%);\
+                                    border: 0px none black;\
+                                    margin: 6px 0px 6px 10px;\
+                                    }");
+#else
         /* A bit of magic to be able to replace the frame.
          * Disable border, adjust margins and make background transparent. */
@@ -505 +531 @@
                                     margin: 3px 0px 3px 10px;\
                                     }");
+#endif
         m_pLineEdit->installEventFilter(this);
         connect(m_pLineEdit, &QILineEdit::textChanged,