Changeset 50522 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Feb 20, 2014 11:52:02 AM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Mac OS X: 7016: Multi-screen support: More appropriate place/time for native fullscreen mode enter.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineWindow.h (modified) (1 diff)
• fullscreen/UIMachineLogicFullscreen.cpp (modified) (2 diffs)
• fullscreen/UIMachineWindowFullscreen.cpp (modified) (2 diffs)
• fullscreen/UIMachineWindowFullscreen.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.h

@@ -56 +56 @@
 
     /* Public getters: */
+    ulong screenId() const { return m_uScreenId; }
     UIMachineView* machineView() const { return m_pMachineView; }
     UIMachineLogic* machineLogic() const { return m_pMachineLogic; }

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

@@ -336 +336 @@
 
 #ifdef Q_WS_MAC
-    /* Keep sync for machine-logic/window(s) in ML and next: */
+    /* On ML and later: */
     if (vboxGlobal().osRelease() > MacOSXRelease_Lion)
     {
         foreach (UIMachineWindow *pMachineWindow, machineWindows())
         {
+            /* Keep sync for machine-logic/window(s): */
             connect(pMachineWindow, SIGNAL(sigNotifyAboutNativeFullscreenDidEnter()),
                     this, SLOT(sltHandleNativeFullscreenDidEnter()));
             connect(pMachineWindow, SIGNAL(sigNotifyAboutNativeFullscreenDidExit()),
                     this, SLOT(sltHandleNativeFullscreenDidExit()));
+            /* Enter native fullscreen mode: */
+            if (darwinScreensHaveSeparateSpaces() || pMachineWindow->screenId() == 0)
+                if (!darwinIsInFullscreenMode(pMachineWindow))
+                    darwinToggleFullscreenMode(pMachineWindow);
         }
     }
@@ -373 +378 @@
 
 #ifdef Q_WS_MAC
-    /* Leave sync for machine-logic/window(s) in ML and next: */
+    /* On ML and later: */
     if (vboxGlobal().osRelease() > MacOSXRelease_Lion)
     {
         foreach (UIMachineWindow *pMachineWindow, machineWindows())
         {
+            /* Leave sync for machine-logic/window(s): */
             disconnect(pMachineWindow, SIGNAL(sigNotifyAboutNativeFullscreenDidEnter()),
                        this, SLOT(sltHandleNativeFullscreenDidEnter()));

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

@@ -73 +73 @@
 #endif /* Q_WS_MAC */
 
-#ifdef RT_OS_DARWIN
-void UIMachineWindowFullscreen::sltToggleNativeFullscreenMode()
-{
-    /* Make sure this method is only used for ML and next: */
-    AssertReturnVoid(vboxGlobal().osRelease() > MacOSXRelease_Lion);
-
-    /* Enter native fullscreen mode: */
-    if (!darwinIsInFullscreenMode(this))
-        darwinToggleFullscreenMode(this);
-}
-#endif /* RT_OS_DARWIN */
-
 void UIMachineWindowFullscreen::sltMachineStateChanged()
 {
@@ -146 +134 @@
         UICocoaApplication::instance()->registerToNativeNotification("NSWindowDidExitFullScreenNotification", this,
                                                                      UIMachineWindow::handleNativeNotification);
-        /* Asynchronously toggle fullscreen mode for every screen which requires it: */
-        if (darwinScreensHaveSeparateSpaces() || m_uScreenId == 0)
-            QTimer::singleShot(0, this, SLOT(sltToggleNativeFullscreenMode()));
     }
 #endif /* Q_WS_MAC */

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

@@ -51 +51 @@
 private slots:
 
-#ifdef RT_OS_DARWIN
-    /** Mac OS X: Toggles native fullscreen mode. */
-    void sltToggleNativeFullscreenMode();
-#endif /* RT_OS_DARWIN */
-
     /* Session event-handlers: */
     void sltMachineStateChanged();