Changeset 51246 in vbox for trunk/src/VBox/Frontends

Timestamp:

May 13, 2014 4:18:35 PM (11 years ago)

Author:

vboxsync

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

93683

Message:

FE/Qt: Mac OS X: Runtime UI: Native Full Screen: Sync NSWindow::toggleFullScreen calls by Qt means (required to enter native full screen mode with modal sheet opened).

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -198 +198 @@
 void darwinToggleFullscreenMode(NativeNSWindowRef pWindow)
 {
-    /* Toggle native fullscreen mode for passed pWindow. This method is available since 10.7 only.
-     * To automatically sync this method subsequent calls we performing it on the main (GUI) thread. */
+    /* Toggle native fullscreen mode for passed pWindow. This method is available since 10.7 only. */
     if ([pWindow respondsToSelector: @selector(toggleFullScreen:)])
-        [pWindow performSelectorOnMainThread: @selector(toggleFullScreen:) withObject: (id)nil waitUntilDone :NO];
+        [pWindow performSelector: @selector(toggleFullScreen:) withObject: (id)nil];
 }
 

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

@@ -438 +438 @@
             /* Window => logic signals: */
             connect(pMachineWindow, SIGNAL(sigNotifyAboutNativeFullscreenWillEnter()),
-                    this, SLOT(sltHandleNativeFullscreenWillEnter()));
+                    this, SLOT(sltHandleNativeFullscreenWillEnter()),
+                    Qt::QueuedConnection);
             connect(pMachineWindow, SIGNAL(sigNotifyAboutNativeFullscreenDidEnter()),
-                    this, SLOT(sltHandleNativeFullscreenDidEnter()));
+                    this, SLOT(sltHandleNativeFullscreenDidEnter()),
+                    Qt::QueuedConnection);
             connect(pMachineWindow, SIGNAL(sigNotifyAboutNativeFullscreenWillExit()),
-                    this, SLOT(sltHandleNativeFullscreenWillExit()));
+                    this, SLOT(sltHandleNativeFullscreenWillExit()),
+                    Qt::QueuedConnection);
             connect(pMachineWindow, SIGNAL(sigNotifyAboutNativeFullscreenDidExit()),
-                    this, SLOT(sltHandleNativeFullscreenDidExit()));
+                    this, SLOT(sltHandleNativeFullscreenDidExit()),
+                    Qt::QueuedConnection);
         }
         /* Revalidate 'fullscreen' windows: */