Changeset 62256 in vbox for trunk/src/VBox

Timestamp:

Jul 14, 2016 2:29:31 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8461: X11: Runtime UI: Avoid touching menu-bar visibility on Unity (Compiz), that provokes duplicated menu-bar.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

@@ -130 +130 @@
 void UIMachineWindowNormal::sltHandleMenuBarConfigurationChange(const QString &strMachineID)
 {
+# ifdef VBOX_WS_X11
+    /* We should skip that stuff on Unity (Compiz) to avoid duplicated menu-bar: */
+    if (vboxGlobal().typeOfWindowManager() == X11WMType_Compiz)
+        return;
+# endif /* VBOX_WS_X11 */
+
     /* Skip unrelated machine IDs: */
     if (vboxGlobal().managedVMUuid() != strMachineID)
@@ -348 +354 @@
     /* Load GUI customizations: */
     {
-#ifndef VBOX_WS_MAC
+#if   defined(VBOX_WS_MAC)
+        /* Nothing for Mac OS X. */
+#elif defined(VBOX_WS_WIN)
         /* Update menu-bar visibility: */
         menuBar()->setVisible(actionPool()->action(UIActionIndexRT_M_View_M_MenuBar_T_Visibility)->isChecked());
-#endif /* !VBOX_WS_MAC */
+#elif defined(VBOX_WS_X11)
+        /* We should skip that stuff on Unity (Compiz) to avoid duplicated menu-bar: */
+        if (vboxGlobal().typeOfWindowManager() != X11WMType_Compiz)
+        {
+            /* Update menu-bar visibility: */
+            menuBar()->setVisible(actionPool()->action(UIActionIndexRT_M_View_M_MenuBar_T_Visibility)->isChecked());
+        }
+#else
+# warning "port me!"
+#endif
         /* Update status-bar visibility: */
         statusBar()->setVisible(actionPool()->action(UIActionIndexRT_M_View_M_StatusBar_T_Visibility)->isChecked());