Changeset 50520 in vbox for trunk/src/VBox

Timestamp:

Feb 20, 2014 11:15:10 AM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Mac OS X: 7016: Multi-screen support: Make sure other window(s) exit fullscreen too when one of them did.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• platform/darwin/VBoxUtils-darwin-cocoa.mm (modified) (2 diffs)
• platform/darwin/VBoxUtils-darwin.cpp (modified) (1 diff)
• platform/darwin/VBoxUtils-darwin.h (modified) (2 diffs)
• runtime/fullscreen/UIMachineLogicFullscreen.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin-cocoa.mm

@@ -38 +38 @@
 /** Easy way of dynamical call for 10.7 AppKit functionality we do not yet support. */
 #define NSWindowCollectionBehaviorFullScreenPrimary (1 << 7)
+#define NSFullScreenWindowMask (1 << 14)
 
 NativeNSWindowRef darwinToNativeWindowImpl(NativeNSViewRef pView)
@@ -201 +202 @@
     if ([pWindow respondsToSelector: @selector(toggleFullScreen:)])
         [pWindow performSelector: @selector(toggleFullScreen:) withObject: (id)nil];
+}
+
+bool darwinIsInFullscreenMode(NativeNSWindowRef pWindow)
+{
+    /* Check whether passed pWindow is in native fullscreen mode. */
+    return [pWindow styleMask] & NSFullScreenWindowMask;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin.cpp

@@ -152 +152 @@
 {
     return ::darwinToggleFullscreenMode(::darwinToNativeWindow(pWidget));
+}
+
+bool darwinIsInFullscreenMode(QWidget *pWidget)
+{
+    return ::darwinIsInFullscreenMode(::darwinToNativeWindow(pWidget));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin.h

@@ -82 +82 @@
 void darwinEnableTransienceSupport(NativeNSWindowRef pWindow);
 void darwinToggleFullscreenMode(NativeNSWindowRef pWindow);
+bool darwinIsInFullscreenMode(NativeNSWindowRef pWindow);
 bool darwinScreensHaveSeparateSpaces();
 
@@ -247 +248 @@
 void darwinEnableTransienceSupport(QWidget *pWidget);
 void darwinToggleFullscreenMode(QWidget *pWidget);
+bool darwinIsInFullscreenMode(QWidget *pWidget);
 bool darwinOpenFile(const QString &strFile);
 

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

@@ -126 +126 @@
     Q_UNUSED(fResult);
 
-    /* Exit fullscreen mode if there is/are no fullscreen window(s) left: */
-    if (m_fullscreenMachineWindows.isEmpty())
+    /* If there is/are still fullscreen window(s) present: */
+    if (!m_fullscreenMachineWindows.isEmpty())
+    {
+        /* Ask remain window(s) to exit fullscreen too: */
+        foreach (UIMachineWindow *pMachineWindow, machineWindows())
+            if (darwinIsInFullscreenMode(pMachineWindow))
+                darwinToggleFullscreenMode(pMachineWindow);
+    }
+    /* If there is/are no more fullscreen window(s) left: */
+    else
     {
         /* Change visual-state to requested: */