Changeset 52512 in vbox

Timestamp:

Aug 28, 2014 12:05:12 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Mac OS X: Runtime UI: Native full-screen: Do not show transient windows unless application is really active; show them on application activation.

Location:

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

Files:

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

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

@@ -32 +32 @@
 #include "QIMenu.h"
 #ifdef Q_WS_MAC
+# include "UICocoaApplication.h"
 # include "UIExtraDataManager.h"
 # include "VBoxUtils.h"
@@ -511 +512 @@
 
 #ifdef Q_WS_MAC
+    /* For ML and next: */
+    if (vboxGlobal().osRelease() > MacOSXRelease_Lion)
+    {
+        /* Register to native notifications: */
+        UICocoaApplication::instance()->registerToNotificationOfWorkspace("NSWorkspaceDidActivateApplicationNotification", this,
+                                                                          UIMachineLogicFullscreen::nativeHandlerForApplicationActivation);
+    }
+
     /* We have to make sure that we are getting the front most process.
      * This is necessary for Qt versions > 4.3.3: */
@@ -599 +608 @@
         return;
 
+#ifdef Q_WS_MAC
+    /* For ML and next: */
+    if (vboxGlobal().osRelease() > MacOSXRelease_Lion)
+    {
+        /* Unregister from native notifications: */
+        UICocoaApplication::instance()->unregisterFromNotificationOfWorkspace("NSWorkspaceDidActivateApplicationNotification", this);
+    }
+#endif/* Q_WS_MAC */
+
     /* Mark machine-window(s) destroyed: */
     setMachineWindowsCreated(false);
@@ -688 +706 @@
 
     /* Get screen ID: */
-    ulong uScreenID = pMachineWindow->screenId();
+    const ulong uScreenID = pMachineWindow->screenId();
     LogRel(("UIMachineLogicFullscreen::revalidateNativeFullScreen: For machine-window #%d.\n",
             (int)uScreenID));
@@ -695 +713 @@
     if (uScreenID != 0 && !screensHaveSeparateSpaces())
     {
-        /* If there is no fullscreen window or it's invalidated: */
-        if (m_fullscreenMachineWindows.isEmpty() || !m_invalidFullscreenMachineWindows.isEmpty())
+        /* We are hiding transient window if:
+         * 1. application is inactive at all or
+         * 2. there is no fullscreen window or it's invalidated. */
+        if (   !UICocoaApplication::instance()->isActive()
+            || m_fullscreenMachineWindows.isEmpty() || !m_invalidFullscreenMachineWindows.isEmpty())
         {
             LogRel(("UIMachineLogicFullscreen::revalidateNativeFullScreen: "
@@ -794 +815 @@
         revalidateNativeFullScreen(pMachineWindow);
 }
+
+/* static */
+void UIMachineLogicFullscreen::nativeHandlerForApplicationActivation(QObject *pObject, const QMap<QString, QString> &userInfo)
+{
+    /* Handle arrived notification: */
+    UIMachineLogicFullscreen *pLogic = qobject_cast<UIMachineLogicFullscreen*>(pObject);
+    AssertPtrReturnVoid(pLogic);
+    {
+        /* Redirect arrived notification: */
+        pLogic->nativeHandlerForApplicationActivation(userInfo);
+    }
+}
+
+void UIMachineLogicFullscreen::nativeHandlerForApplicationActivation(const QMap<QString, QString> &userInfo)
+{
+    /* 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();
+                }
+            }
+    }
+}
 #endif /* Q_WS_MAC */
 

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

@@ -139 +139 @@
     /** Mac OS X: Revalidates 'fullscreen' mode for all windows. */
     void revalidateNativeFullScreen();
+
+    /** Mac OS X: Proxies native notification about active space change. */
+    static void nativeHandlerForApplicationActivation(QObject *pObject, const QMap<QString, QString> &userInfo);
+    /** Mac OS X: Handles native notification about active space change. */
+    void nativeHandlerForApplicationActivation(const QMap<QString, QString> &userInfo);
 #endif /* Q_WS_MAC */