Changeset 52729 in vbox

Timestamp:

Sep 12, 2014 4:19:07 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

96070

Message:

FE/Qt: Mac OS X: Runtime UI: Mini-toolbar: Manual show/hide for compliance with native full-screen feature logic.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• runtime/fullscreen/UIMachineLogicFullscreen.cpp (modified) (8 diffs)
• runtime/fullscreen/UIMachineWindowFullscreen.cpp (modified) (5 diffs)
• runtime/fullscreen/UIMachineWindowFullscreen.h (modified) (1 diff)
• widgets/UIMiniToolBar.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp

@@ -696 +696 @@
 void UIMachineLogicFullscreen::revalidateNativeFullScreen(UIMachineWindow *pMachineWindow)
 {
+    /* Make sure that is full-screen machine-window: */
+    UIMachineWindowFullscreen *pMachineWindowFullscreen = qobject_cast<UIMachineWindowFullscreen*>(pMachineWindow);
+    AssertPtrReturnVoid(pMachineWindowFullscreen);
+
     /* Make sure window is not already invalidated: */
     if (m_invalidFullscreenMachineWindows.contains(pMachineWindow))
@@ -701 +705 @@
 
     /* Ignore window if it is in 'fullscreen transition': */
-    if (qobject_cast<UIMachineWindowFullscreen*>(pMachineWindow)->isInFullscreenTransition())
+    if (pMachineWindowFullscreen->isInFullscreenTransition())
         return;
 
@@ -721 +725 @@
                     "Ask transient machine-window #%d to hide.\n", (int)uScreenID));
 
+            /* Make sure mini-toolbar hidden: */
+            pMachineWindowFullscreen->setMiniToolbarVisible(false);
+            /* Make sure window hidden: */
             pMachineWindow->hide();
         }
@@ -731 +738 @@
             /* Make sure window have proper geometry and shown: */
             pMachineWindow->showInNecessaryMode();
+            /* Make sure mini-toolbar shown: */
+            pMachineWindowFullscreen->setMiniToolbarVisible(true);
         }
     }
@@ -751 +760 @@
                 setPresentationModeEnabled(true);
 
+                /* Make sure mini-toolbar hidden: */
+                pMachineWindowFullscreen->setMiniToolbarVisible(false);
                 /* Make sure window have proper geometry and shown: */
                 pMachineWindow->showInNecessaryMode();
@@ -764 +775 @@
                         "Ask machine-window #%d to hide.\n", (int)uScreenID));
 
+                /* Make sure mini-toolbar hidden: */
+                pMachineWindowFullscreen->setMiniToolbarVisible(false);
+                /* Make sure window hidden: */
                 pMachineWindow->hide();
             }
@@ -790 +804 @@
                 m_invalidFullscreenMachineWindows << pMachineWindow;
 
+                /* Make sure mini-toolbar hidden: */
+                pMachineWindowFullscreen->setMiniToolbarVisible(false);
                 /* Ask window to exit 'fullscreen' mode: */
                 emit sigNotifyAboutNativeFullscreenShouldBeExited(pMachineWindow);
+                return;
             }
 
@@ -801 +818 @@
                         "Ask machine-window #%d to adjust guest geometry.\n", (int)uScreenID));
 
+                /* Make sure mini-toolbar shown: */
+                pMachineWindowFullscreen->setMiniToolbarVisible(true);
                 /* Just adjust machine-view size if necessary: */
                 pMachineWindow->adjustMachineViewSize();
+                return;
             }
+
+            /* Make sure mini-toolbar shown: */
+            pMachineWindowFullscreen->setMiniToolbarVisible(true);
         }
     }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp

@@ -100 +100 @@
         emit sigNotifyAboutNativeFullscreenFailToEnter();
     }
+}
+
+void UIMachineWindowFullscreen::setMiniToolbarVisible(bool fVisible)
+{
+    /* Make sure mini-toolbar exists: */
+    if (!m_pMiniToolBar)
+        return;
+    /* Set mini-toolbar visibility to passed one: */
+    m_pMiniToolBar->setVisible(fVisible);
 }
 #endif /* Q_WS_MAC */
@@ -329 +338 @@
     AssertPtrReturnVoid(pFullscreenLogic);
 
+#ifdef Q_WS_MAC
+    /* ML and next using native stuff: */
+    const bool fSupportsNativeFullScreen = vboxGlobal().osRelease() > MacOSXRelease_Lion;
+#endif /* Q_WS_MAC */
+
     /* Make sure this window should be shown and mapped to some host-screen: */
     if (!uisession()->isScreenVisible(m_uScreenId) ||
@@ -334 +348 @@
     {
         /* Hide mini-toolbar: */
-        if (m_pMiniToolBar)
+        if (   m_pMiniToolBar
+#ifdef Q_WS_MAC
+            && !fSupportsNativeFullScreen
+#endif /* Q_WS_MAC */
+            )
             m_pMiniToolBar->hide();
         /* Hide window: */
@@ -360 +378 @@
     /* ML and next using native stuff, so we can call for simple show(),
      * Lion and previous using Qt stuff, so we should call for showFullScreen(): */
-    const bool fSupportsNativeFullScreen = vboxGlobal().osRelease() > MacOSXRelease_Lion;
     if (fSupportsNativeFullScreen)
         show();
@@ -391 +408 @@
 
     /* Show mini-toolbar: */
-    if (m_pMiniToolBar)
+    if (   m_pMiniToolBar
+#ifdef Q_WS_MAC
+        && !fSupportsNativeFullScreen
+#endif /* Q_WS_MAC */
+        )
         m_pMiniToolBar->show();
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.h

@@ -53 +53 @@
     /** Mac OS X: Returns whether window is in 'fullscreen' transition. */
     bool isInFullscreenTransition() const { return m_fIsInFullscreenTransition; }
+    /** Mac OS X: Defines whether mini-toolbar should be @a fVisible. */
+    void setMiniToolbarVisible(bool fVisible);
 #endif /* Q_WS_MAC */
 

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

@@ -288 +288 @@
     /* Adjust geometry finally: */
     adjustGeometry();
-
-    /* Show: */
-    show();
 }