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

Timestamp:

Aug 6, 2014 4:56:26 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Mac OS X: Runtime UI: Cache 'screens have separate spaces' value in machine-logic.

Location:

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

Files:

• UIMachineLogicFullscreen.cpp (modified) (3 diffs)
• UIMachineLogicFullscreen.h (modified) (4 diffs)
• UIMachineWindowFullscreen.cpp (modified) (6 diffs)

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

@@ -42 +42 @@
     , m_pPopupMenu(0)
 #ifdef Q_WS_MAC
-    , m_fadeToken(kCGDisplayFadeReservationInvalidToken)
+    , m_fScreensHaveSeparateSpaces(darwinScreensHaveSeparateSpaces())
 #endif /* Q_WS_MAC */
 {
@@ -144 +144 @@
             && hasHostScreenForGuestScreen(pMachineWindow->screenId()))
             visibleMachineWindows << pMachineWindow;
-    if (   !darwinScreensHaveSeparateSpaces()
+    if (   !screensHaveSeparateSpaces()
         || m_fullscreenMachineWindows == visibleMachineWindows)
         fadeToNormal();
@@ -722 +722 @@
 
     /* Validate window which can't be fullscreen: */
-    if (uScreenID != 0 && !darwinScreensHaveSeparateSpaces())
+    if (uScreenID != 0 && !screensHaveSeparateSpaces())
     {
         LogRel(("UIMachineLogicFullscreen::revalidateNativeFullScreen: "

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

@@ -36 +36 @@
 #ifdef RT_OS_DARWIN
 signals:
+
     /** Mac OS X: Notifies listeners about native fullscreen mode should be entered on @a pMachineWindow. */
     void sigNotifyAboutNativeFullscreenShouldBeEntered(UIMachineWindow *pMachineWindow = 0);
@@ -41 +42 @@
     void sigNotifyAboutNativeFullscreenShouldBeExited(UIMachineWindow *pMachineWindow = 0);
 #endif /* RT_OS_DARWIN */
+
+#ifdef Q_WS_MAC
+public:
+
+    /** Returns whether screens have separate spaces. */
+    bool screensHaveSeparateSpaces() const { return m_fScreensHaveSeparateSpaces; }
+#endif /* Q_WS_MAC */
 
 protected:
@@ -90 +98 @@
     void sltInvokePopupMenu();
 
-#ifdef Q_WS_MAC
+#ifdef RT_OS_DARWIN
     void sltChangePresentationMode(bool fEnabled);
-#endif /* Q_WS_MAC */
+#endif /* RT_OS_DARWIN */
 
     /** Updates machine-window(s) location/size on screen-layout changes. */
@@ -145 +153 @@
 
 #ifdef Q_WS_MAC
+    /** Mac OS X: Holds whether screens have separate spaces. */
+    const bool m_fScreensHaveSeparateSpaces;
+
     /** Mac OS X: Fade token. */
     CGDisplayFadeReservationToken m_fadeToken;

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

@@ -129 +129 @@
     /* Make sure this window has fullscreen logic: */
     UIMachineLogicFullscreen *pFullscreenLogic = qobject_cast<UIMachineLogicFullscreen*>(machineLogic());
-    if (!pFullscreenLogic)
-        return;
+    AssertPtrReturnVoid(pFullscreenLogic);
 
     /* Make sure this window mapped to some host-screen: */
@@ -140 +139 @@
 
     /* Enter native fullscreen mode if necessary: */
-    if (   (darwinScreensHaveSeparateSpaces() || m_uScreenId == 0)
+    if (   (pFullscreenLogic->screensHaveSeparateSpaces() || m_uScreenId == 0)
         && !darwinIsInFullscreenMode(this))
         darwinToggleFullscreenMode(this);
@@ -154 +153 @@
         return;
 
+    /* Make sure this window has fullscreen logic: */
+    UIMachineLogicFullscreen *pFullscreenLogic = qobject_cast<UIMachineLogicFullscreen*>(machineLogic());
+    AssertPtrReturnVoid(pFullscreenLogic);
+
     /* Mark window 'transitioned from fullscreen': */
     m_fIsInFullscreenTransition = true;
 
     /* Exit native fullscreen mode if necessary: */
-    if (   (darwinScreensHaveSeparateSpaces() || m_uScreenId == 0)
+    if (   (pFullscreenLogic->screensHaveSeparateSpaces() || m_uScreenId == 0)
         && darwinIsInFullscreenMode(this))
         darwinToggleFullscreenMode(this);
@@ -189 +192 @@
     if (vboxGlobal().osRelease() > MacOSXRelease_Lion)
     {
+        /* Make sure this window has fullscreen logic: */
+        UIMachineLogicFullscreen *pFullscreenLogic = qobject_cast<UIMachineLogicFullscreen*>(machineLogic());
+        AssertPtrReturnVoid(pFullscreenLogic);
         /* Enable fullscreen support for every screen which requires it: */
-        if (darwinScreensHaveSeparateSpaces() || m_uScreenId == 0)
+        if (pFullscreenLogic->screensHaveSeparateSpaces() || m_uScreenId == 0)
             darwinEnableFullscreenSupport(this);
         /* Enable transience support for other screens: */
@@ -276 +282 @@
     move(workingArea.topLeft());
 #ifdef Q_WS_MAC
+    /* Make sure this window has fullscreen logic: */
+    UIMachineLogicFullscreen *pFullscreenLogic = qobject_cast<UIMachineLogicFullscreen*>(machineLogic());
+    AssertPtrReturnVoid(pFullscreenLogic);
     /* Resize to the appropriate size on Lion and previous: */
     if (vboxGlobal().osRelease() <= MacOSXRelease_Lion)
@@ -281 +290 @@
     /* Resize to the appropriate size on ML and next
      * only if that screen has no own user-space: */
-    else if (!darwinScreensHaveSeparateSpaces() && m_uScreenId != 0)
+    else if (!pFullscreenLogic->screensHaveSeparateSpaces() && m_uScreenId != 0)
         resize(workingArea.size());
 #else /* !Q_WS_MAC */