Changeset 54079 in vbox

Timestamp:

Feb 5, 2015 6:33:46 AM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Mac OS X: Prevent QIToolButton from changing size-hint when that is not necessary.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIToolButton.h (modified) (1 diff)
• runtime/UIMenuBarEditorWindow.cpp (modified) (1 diff)
• runtime/UIStatusBarEditorWindow.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIToolButton.h

@@ -32 +32 @@
     {
 #ifdef Q_WS_MAC
-        setStyleSheet("QToolButton { border: 0px none black; margin: 2px 4px 0px 4px; } QToolButton::menu-indicator {image: none;}");
+        /* Keep size-hint alive: */
+        const QSize sh = sizeHint();
+        setStyleSheet("QToolButton { border: 0px none black; margin: 0px 0px 0px 0px; } QToolButton::menu-indicator {image: none;}");
+        setFixedSize(sh);
 #else /* !Q_WS_MAC */
         setAutoRaise(true);
+#endif /* !Q_WS_MAC */
+    }
+
+    /** Sets the auto-raise status. */
+    virtual void setAutoRaise(bool fEnable)
+    {
+#ifdef Q_WS_MAC
+        /* Ignore for Mac OS X: */
+        Q_UNUSED(fEnable);
+#else /* !Q_WS_MAC */
+        /* Call to base-class: */
+        QToolButton::setAutoRaise(fEnable);
 #endif /* !Q_WS_MAC */
     }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMenuBarEditorWindow.cpp

@@ -252 +252 @@
                 /* Configure close-button: */
                 m_pButtonClose->setFocusPolicy(Qt::StrongFocus);
-                m_pButtonClose->setMinimumSize(QSize(1, 1));
                 m_pButtonClose->setShortcut(Qt::Key_Escape);
                 m_pButtonClose->setIcon(UIIconPool::iconSet(":/ok_16px.png"));

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIStatusBarEditorWindow.cpp

@@ -359 +359 @@
                 /* Configure close-button: */
                 m_pButtonClose->setFocusPolicy(Qt::StrongFocus);
-                m_pButtonClose->setMinimumSize(QSize(1, 1));
                 m_pButtonClose->setShortcut(Qt::Key_Escape);
                 m_pButtonClose->setIcon(UIIconPool::iconSet(":/ok_16px.png"));