Changeset 74593 in vbox for trunk

Timestamp:

Oct 3, 2018 12:19:06 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9241: macOS: Reworking UIToolBar to have possibility to emulate native style.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets

Files:

• UIToolBar.cpp (modified) (6 diffs)
• UIToolBar.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp

@@ -24 +24 @@
 # include <QMainWindow>
 # include <QResizeEvent>
+# ifdef VBOX_WS_MAC
+#  include <QPainter>
+# endif
 
 /* GUI includes: */
@@ -37 +40 @@
     : QToolBar(pParent)
     , m_pMainWindow(qobject_cast<QMainWindow*>(pParent))
+#ifdef VBOX_WS_MAC
+    , m_fEmulateUnifiedToolbar(false)
+#endif
 {
     /* Prepare: */
@@ -62 +68 @@
 }
 
+void UIToolBar::emulateMacToolbar()
+{
+    /* Remember request, to be used in paintEvent: */
+    m_fEmulateUnifiedToolbar = true;
+}
+
 void UIToolBar::setShowToolBarButton(bool fShow)
 {
@@ -71 +83 @@
     // WORKAROUND:
     // There is a bug in Qt Cocoa which result in showing a "more arrow" when
-    // the necessary size of the toolbar is increased. Also for some languages
+    // the necessary size of the tool-bar is increased. Also for some languages
     // the with doesn't match if the text increase. So manually adjust the size
     // after changing the text.
@@ -92 +104 @@
 }
 
+#ifdef VBOX_WS_MAC
+void UIToolBar::paintEvent(QPaintEvent *pEvent)
+{
+    /* Call to base-class: */
+    QToolBar::paintEvent(pEvent);
+
+    /* If we have request to emulate unified tool-bar: */
+    if (m_fEmulateUnifiedToolbar)
+    {
+        /* Acquire rectangle: */
+        const QRect rectangle = pEvent->rect();
+
+        /* Prepare gradient: */
+        const QColor backgroundColor = palette().color(QPalette::Active, QPalette::Mid);
+        QLinearGradient gradient(rectangle.topLeft(), rectangle.bottomLeft());
+        gradient.setColorAt(0,   backgroundColor.lighter(125));
+        gradient.setColorAt(.65, backgroundColor.lighter(130));
+        gradient.setColorAt(1,   backgroundColor.lighter(135));
+
+        /* Fill background: */
+        QPainter painter(this);
+        painter.fillRect(rectangle, gradient);
+    }
+}
+#endif /* VBOX_WS_MAC */
+
 void UIToolBar::prepare()
 {
@@ -109 +147 @@
     setContextMenuPolicy(Qt::NoContextMenu);
 }
-

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.h

@@ -27 +27 @@
 /* Forward declarations: */
 class QMainWindow;
+class QResizeEvent;
+class QWidget;
+#ifdef VBOX_WS_MAC
+class QPaintEvent;
+#endif
 
-/** QToolBar extension
-  * with few settings presets. */
+/** QToolBar extension with few settings presets. */
 class SHARED_LIBRARY_STUFF UIToolBar : public QToolBar
 {
@@ -48 +52 @@
 
 #ifdef VBOX_WS_MAC
-    /** Mac OS X: Defines whether native tool-bar should be used. */
+    /** Mac OS X: Defines whether native tool-bar should be enabled. */
     void enableMacToolbar();
+    /** Mac OS X: Defines whether native tool-bar should be emulated. */
+    void emulateMacToolbar();
+
     /** Mac OS X: Defines whether native tool-bar button should be shown. */
     void setShowToolBarButton(bool fShow);
     /** Mac OS X: Updates native tool-bar layout. */
     void updateLayout();
-#endif /* VBOX_WS_MAC */
+#endif
 
 protected:
@@ -60 +67 @@
     /** Handles resize @a pEvent. */
     virtual void resizeEvent(QResizeEvent *pEvent) /* override */;
+
+#ifdef VBOX_WS_MAC
+    /** Handles paint @a pEvent. */
+    virtual void paintEvent(QPaintEvent *pEvent) /* override */;
+#endif
 
 private:
@@ -68 +80 @@
     /** Holds the parent main-window isntance. */
     QMainWindow *m_pMainWindow;
+
+#ifdef VBOX_WS_MAC
+    /** Holds whether unified tool-bar should be emulated. */
+    bool  m_fEmulateUnifiedToolbar;
+#endif
 };
 
 #endif /* !___UIToolBar_h___ */
-