VirtualBox

Timestamp:

Feb 19, 2014 3:03:24 PM (11 years ago)

Author:

vboxsync

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

92347

Message:

FE/Qt: Mac OS X: 7016: Check if *screens have separate spaces* feature is supported/enabled, use *transience* for non-primary screens otherwise.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

-              r50479
+              r50505
+}
+void darwinEnableTransienceSupport(NativeNSWindowRef pWindow)
+{
+    [pWindow setCollectionBehavior :NSWindowCollectionBehaviorTransient];
+}
 void darwinToggleFullscreenMode(NativeNSWindowRef pWindow)
+{
 …
     if ([pWindow respondsToSelector: @selector(toggleFullScreen:)])
         [pWindow performSelector: @selector(toggleFullScreen:) withObject: (id)nil];
+}
+bool darwinScreensHaveSeparateSpaces()
+{
+    /* Check whether screens have separate spaces.
+     * This method is available since 10.9 only. */
+    if ([NSScreen respondsToSelector: @selector(screensHaveSeparateSpaces)])
+        return [NSScreen performSelector: @selector(screensHaveSeparateSpaces)];
+    else
+        return false;
+}

r50479	r50505
142	142	{
143	143	return ::darwinEnableFullscreenSupport(::darwinToNativeWindow(pWidget));
	144	}
	145
	146	void darwinEnableTransienceSupport(QWidget *pWidget)
	147	{
	148	return ::darwinEnableTransienceSupport(::darwinToNativeWindow(pWidget));
144	149	}
145	150

-              r50479
+              r50505
 void darwinMinaturizeWindow(NativeNSWindowRef pWindow);
 void darwinEnableFullscreenSupport(NativeNSWindowRef pWindow);
+void darwinEnableTransienceSupport(NativeNSWindowRef pWindow);
 void darwinToggleFullscreenMode(NativeNSWindowRef pWindow);
+bool darwinScreensHaveSeparateSpaces();
 bool darwinOpenFile(NativeNSStringRef pstrFile);
 …
 void darwinMinaturizeWindow(QWidget *pWidget);
 void darwinEnableFullscreenSupport(QWidget *pWidget);
+void darwinEnableTransienceSupport(QWidget *pWidget);
 void darwinToggleFullscreenMode(QWidget *pWidget);
 bool darwinOpenFile(const QString &strFile);

-              r50498
+              r50505
+    {
         case UIVisualStateType_Normal: return Qt::Window;
-#ifdef Q_WS_MAC
-        /* We want normal window for native fullscreen mode on ML and next: */
-        case UIVisualStateType_Fullscreen: return vboxGlobal().osRelease() > MacOSXRelease_Lion ? Qt::Window : Qt::FramelessWindowHint;
-#else /* !Q_WS_MAC */
         case UIVisualStateType_Fullscreen: return Qt::FramelessWindowHint;
-#endif /* !Q_WS_MAC */
         case UIVisualStateType_Seamless: return Qt::FramelessWindowHint;
         case UIVisualStateType_Scale: return Qt::Window;

-              r50498
+              r50505
     if (vboxGlobal().osRelease() > MacOSXRelease_Lion)
+    {
+        /* Enable native fullscreen support: */
+        darwinEnableFullscreenSupport(this);
+        /* Enable fullscreen support for every screen which requires it: */
+        if (darwinScreensHaveSeparateSpaces() || m_uScreenId == 0)
+            darwinEnableFullscreenSupport(this);
+        /* Enable transience support for other screens: */
+        else
+            darwinEnableTransienceSupport(this);
         /* Register to native fullscreen notifications: */
         UICocoaApplication::instance()->registerToNativeNotification("NSWindowDidEnterFullScreenNotification", this,
 …
         UICocoaApplication::instance()->registerToNativeNotification("NSWindowDidExitFullScreenNotification", this,
                                                                      UIMachineWindow::handleNativeNotification);
+        /* Asynchronously toggle native fullscreen mode: */
+        QTimer::singleShot(0, this, SLOT(sltToggleNativeFullscreenMode()));
+        /* 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 */

Note: See TracChangeset for help on using the changeset viewer.