Changeset 52752 in vbox

Timestamp:

Sep 15, 2014 3:15:38 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Mac OS X: Runtime UI: Native full-screen: Active user-space change handler revalidating transient windows.

Location:

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

Files:

• UIMachineLogicFullscreen.cpp (modified) (4 diffs)
• UIMachineLogicFullscreen.h (modified) (1 diff)

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

@@ -523 +523 @@
         UICocoaApplication::instance()->registerToNotificationOfWorkspace("NSWorkspaceDidActivateApplicationNotification", this,
                                                                           UIMachineLogicFullscreen::nativeHandlerForApplicationActivation);
+        UICocoaApplication::instance()->registerToNotificationOfWorkspace("NSWorkspaceActiveSpaceDidChangeNotification", this,
+                                                                          UIMachineLogicFullscreen::nativeHandlerForActiveSpaceChange);
     }
 
@@ -619 +621 @@
         /* Unregister from native notifications: */
         UICocoaApplication::instance()->unregisterFromNotificationOfWorkspace("NSWorkspaceDidActivateApplicationNotification", this);
+        UICocoaApplication::instance()->unregisterFromNotificationOfWorkspace("NSWorkspaceActiveSpaceDidChangeNotification", this);
     }
 #endif/* Q_WS_MAC */
@@ -723 +726 @@
     {
         /* We are hiding transient window if:
-         * 1. application is inactive at all or
+         * 1. primary window is not on active user-space
          * 2. there is no fullscreen window or it's invalidated. */
-        if (   !UICocoaApplication::instance()->isActive()
+        if (   !darwinIsOnActiveSpace(machineWindows().first())
             || m_fullscreenMachineWindows.isEmpty() || !m_invalidFullscreenMachineWindows.isEmpty())
         {
@@ -860 +863 @@
     /* Make sure we have BundleIdentifier key: */
     AssertReturnVoid(userInfo.contains("BundleIdentifier"));
-
-    /* On VirtualBox activation: */
-    if (userInfo.value("BundleIdentifier") == "org.virtualbox.app.VirtualBox")
-    {
-        LogRel(("UIMachineLogicFullscreen::nativeHandlerForApplicationActivation: BundleIdentifier = %s\n",
-                userInfo.value("BundleIdentifier").toAscii().constData()));
-
-        /* Make sure all the transient machine-windows updated: */
-        foreach (UIMachineWindow *pMachineWindow, machineWindows())
-            if (pMachineWindow->screenId() != 0 && !screensHaveSeparateSpaces())
-            {
-                /* If there is no fullscreen window or it's invalidated: */
-                if (m_fullscreenMachineWindows.isEmpty() || !m_invalidFullscreenMachineWindows.isEmpty())
-                {
-                    LogRel(("UIMachineLogicFullscreen::nativeHandlerForApplicationActivation: "
-                            "Ask transient machine-window #%d to hide.\n", (int)pMachineWindow->screenId()));
-
-                    pMachineWindow->hide();
-                }
-                /* If there is valid fullscreen window: */
-                else
-                {
-                    LogRel(("UIMachineLogicFullscreen::nativeHandlerForApplicationActivation: "
-                            "Ask transient machine-window #%d to show/normalize.\n", (int)pMachineWindow->screenId()));
-
-                    /* Make sure window have proper geometry and shown: */
-                    pMachineWindow->showInNecessaryMode();
-                }
-            }
-    }
+    /* Skip other applications: */
+    if (userInfo.value("BundleIdentifier") != "org.virtualbox.app.VirtualBox")
+        return;
+
+    /* Skip if 'screen have separate spaces': */
+    if (screensHaveSeparateSpaces())
+        return;
+
+    /* Skip if there is another than needed user-space is active: */
+    if (!darwinIsOnActiveSpace(machineWindows().first()))
+        return;
+
+    LogRel(("UIMachineLogicFullscreen::nativeHandlerForApplicationActivation: "
+            "Full-screen application activated.\n"));
+
+    /* Revalidate full-screen mode for transient machine-window(s): */
+    foreach (UIMachineWindow *pMachineWindow, machineWindows())
+        if (pMachineWindow->screenId() > 0)
+            revalidateNativeFullScreen(pMachineWindow);
+}
+
+/* static */
+void UIMachineLogicFullscreen::nativeHandlerForActiveSpaceChange(QObject *pObject, const QMap<QString, QString> &userInfo)
+{
+    /* Handle arrived notification: */
+    UIMachineLogicFullscreen *pLogic = qobject_cast<UIMachineLogicFullscreen*>(pObject);
+    AssertPtrReturnVoid(pLogic);
+    {
+        /* Redirect arrived notification: */
+        pLogic->nativeHandlerForActiveSpaceChange(userInfo);
+    }
+}
+
+void UIMachineLogicFullscreen::nativeHandlerForActiveSpaceChange(const QMap<QString, QString>&)
+{
+    /* Skip if 'screen have separate spaces': */
+    if (screensHaveSeparateSpaces())
+        return;
+
+    /* Skip if there is another than needed user-space is active: */
+    if (!darwinIsOnActiveSpace(machineWindows().first()))
+        return;
+
+    LogRel(("UIMachineLogicFullscreen::nativeHandlerForActiveSpaceChange: "
+            "Full-screen user-space activated.\n"));
+
+    /* Revalidate full-screen mode for transient machine-window(s): */
+    foreach (UIMachineWindow *pMachineWindow, machineWindows())
+        if (pMachineWindow->screenId() > 0)
+            revalidateNativeFullScreen(pMachineWindow);
 }
 #endif /* Q_WS_MAC */

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

@@ -142 +142 @@
     void revalidateNativeFullScreen();
 
+    /** Mac OS X: Proxies native notification about application activation. */
+    static void nativeHandlerForApplicationActivation(QObject *pObject, const QMap<QString, QString> &userInfo);
+    /** Mac OS X: Handles native notification about application activation. */
+    void nativeHandlerForApplicationActivation(const QMap<QString, QString> &userInfo);
+
     /** Mac OS X: Proxies native notification about active space change. */
-    static void nativeHandlerForApplicationActivation(QObject *pObject, const QMap<QString, QString> &userInfo);
+    static void nativeHandlerForActiveSpaceChange(QObject *pObject, const QMap<QString, QString> &userInfo);
     /** Mac OS X: Handles native notification about active space change. */
-    void nativeHandlerForApplicationActivation(const QMap<QString, QString> &userInfo);
+    void nativeHandlerForActiveSpaceChange(const QMap<QString, QString> &userInfo);
 #endif /* Q_WS_MAC */