Changeset 20232 in vbox

Timestamp:

Jun 3, 2009 2:22:19 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: 3948: Mini-ToolBar for Full-screen & Seamless modes - fixing bug with double tool-button menu-action representation.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxMiniToolBar.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxMiniToolBar.cpp

@@ -34 +34 @@
 #include <QRegion>
 #include <QTimer>
+#include <QToolButton>
 
 VBoxMiniToolBar::VBoxMiniToolBar (QWidget *aParent, Alignment aAlignment)
@@ -114 +115 @@
     for (int i = 0; i < aMenus.size(); ++ i)
     {
-        insertAction (mInsertPosition, aMenus [i]->menuAction());
+        QAction *action = aMenus [i]->menuAction();
+        insertAction (mInsertPosition, action);
+        if (QToolButton *button = qobject_cast <QToolButton*> (widgetForAction (action)))
+            button->setPopupMode (QToolButton::InstantPopup);
         if (i != aMenus.size() - 1)
-        {
-            QWidget *spacer = new QWidget (this);
-            insertWidget (mInsertPosition, spacer);
-            mSpacings << spacer;
-        }
+            mSpacings << widgetForAction (insertWidget (mInsertPosition, new QWidget (this)));
     }
     return *this;