Changeset 16319 in vbox

Timestamp:

Jan 28, 2009 4:24:35 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: 3530: Host+Home shows machine menu in Seamless/Fullscreen modes. A little w/a to avoid showing sub-menu but highlight only the first menu item.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxConsoleWnd.h (modified) (4 diffs)
• src/VBoxConsoleWnd.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleWnd.h

@@ -35 +35 @@
 #include <QColor>
 #include <QDialog>
+#include <QMenu>
 
 #ifdef VBOX_WITH_DEBUGGER_GUI
@@ -49 +50 @@
 class QLabel;
 class QSpacerItem;
-class QMenu;
 
 class VBoxConsoleView;
@@ -58 +58 @@
 
 class VBoxChangeDockIconUpdateEvent;
+
+/* We want to make the first action highlighted but not
+ * selected, but Qt makes the both or neither one of this,
+ * so, just move the focus to the next eligible object,
+ * which will be the first menu action. This little
+ * subclass made only for that purpose. */
+class QIMenu : public QMenu
+{
+    Q_OBJECT;
+
+public:
+
+    QIMenu (QWidget *aParent) : QMenu (aParent) {}
+
+    void selectFirstAction() { QMenu::focusNextChild(); }
+};
 
 class VBoxConsoleWnd : public QIWithRetranslateUI2<QMainWindow>
@@ -236 +252 @@
 
     /** Popup version of the main menu */
-    QMenu *mMainMenu;
+    QIMenu *mMainMenu;
 
     QActionGroup *mRunningActions;

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

@@ -398 +398 @@
     ///// Menubar ///////////////////////////////////////////////////////////
 
-    mMainMenu = new QMenu (this);
+    mMainMenu = new QIMenu (this);
 
     /* Machine submenu */
@@ -1188 +1188 @@
     }
 
-    mMainMenu->setActiveAction (mMainMenu->actions().first());
     mMainMenu->popup (pos);
-    mMainMenu->activateWindow();
+    mMainMenu->selectFirstAction();
 }