Changeset 50521 in vbox

Timestamp:

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

Author:

vboxsync

Message:

FE/Qt: Mac OS X: 7016: Multi-screen support: Check if that is really necessary to enter/exit fullscreen mode for particular window.

Location:

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

Files:

• UIMachineLogicFullscreen.cpp (modified) (3 diffs)
• UIMachineWindowFullscreen.cpp (modified) (1 diff)

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

@@ -158 +158 @@
         /* Request 'normal' (window) visual-state: */
         uisession()->setRequestedVisualState(UIVisualStateType_Normal);
-        /* Toggle native fullscreen mode for each window: */
-        foreach (UIMachineWindow *pMachineWindow, machineWindows())
-            darwinToggleFullscreenMode(pMachineWindow);
+        /* Exit native fullscreen mode for each window: */
+        foreach (UIMachineWindow *pMachineWindow, machineWindows())
+            if (darwinIsInFullscreenMode(pMachineWindow))
+                darwinToggleFullscreenMode(pMachineWindow);
     }
 }
@@ -174 +175 @@
         /* Request 'seamless' visual-state: */
         uisession()->setRequestedVisualState(UIVisualStateType_Seamless);
-        /* Toggle native fullscreen mode for each window: */
-        foreach (UIMachineWindow *pMachineWindow, machineWindows())
-            darwinToggleFullscreenMode(pMachineWindow);
+        /* Exit native fullscreen mode for each window: */
+        foreach (UIMachineWindow *pMachineWindow, machineWindows())
+            if (darwinIsInFullscreenMode(pMachineWindow))
+                darwinToggleFullscreenMode(pMachineWindow);
     }
 }
@@ -190 +192 @@
         /* Request 'scale' visual-state: */
         uisession()->setRequestedVisualState(UIVisualStateType_Scale);
-        /* Toggle native fullscreen mode for each window: */
-        foreach (UIMachineWindow *pMachineWindow, machineWindows())
-            darwinToggleFullscreenMode(pMachineWindow);
+        /* Exit native fullscreen mode for each window: */
+        foreach (UIMachineWindow *pMachineWindow, machineWindows())
+            if (darwinIsInFullscreenMode(pMachineWindow))
+                darwinToggleFullscreenMode(pMachineWindow);
     }
 }

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

@@ -79 +79 @@
     AssertReturnVoid(vboxGlobal().osRelease() > MacOSXRelease_Lion);
 
-    /* Toggle native fullscreen mode: */
-    darwinToggleFullscreenMode(this);
+    /* Enter native fullscreen mode: */
+    if (!darwinIsInFullscreenMode(this))
+        darwinToggleFullscreenMode(this);
 }
 #endif /* RT_OS_DARWIN */