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

Timestamp:

Aug 6, 2014 5:19:03 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Mac OS X: Runtime UI: Native full-screen support: Subsequent cumulative native full-screen validation fix.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp (modified) (11 diffs)

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

@@ -29 +29 @@
 #include "UIMultiScreenLayout.h"
 #include "UIShortcutPool.h"
+#include "UIMachineView.h"
 #include "QIMenu.h"
 #ifdef Q_WS_MAC
@@ -145 +146 @@
     m_fullscreenMachineWindows.insert(pMachineWindow);
     AssertReturnVoid(m_fullscreenMachineWindows.contains(pMachineWindow));
+
+    /* Revalidate native fullscreen: */
+    revalidateNativeFullScreen();
 }
 
@@ -186 +190 @@
                 (int)pMachineWindow->screenId()));
 
-        /* Exclude window from invalidation list: */
+        /* Exclude machine-window from invalidation set: */
         m_invalidFullscreenMachineWindows.remove(pMachineWindow);
-
-        /* Revalidate 'fullscreen' window: */
-        revalidateNativeFullScreen(pMachineWindow);
+        AssertReturnVoid(!m_invalidFullscreenMachineWindows.contains(pMachineWindow));
+
+        /* Revalidate native fullscreen: */
+        revalidateNativeFullScreen();
     }
     /* If there are no invalidated windows: */
@@ -383 +388 @@
         setPresentationModeEnabled(true);
     }
-    /* Revalidate 'fullscreen' windows for ML and next: */
+    /* Revalidate native fullscreen for ML and next: */
     else revalidateNativeFullScreen();
 #else /* !Q_WS_MAC */
@@ -405 +410 @@
     if (vboxGlobal().osRelease() <= MacOSXRelease_Lion)
         UIMachineLogic::sltGuestMonitorChange(changeType, uScreenId, screenGeo);
-    /* Revalidate 'fullscreen' windows for ML and next: */
+    /* Revalidate native fullscreen for ML and next: */
     else revalidateNativeFullScreen();
 #else /* !Q_WS_MAC */
@@ -424 +429 @@
     if (vboxGlobal().osRelease() <= MacOSXRelease_Lion)
         UIMachineLogic::sltHostScreenCountChange();
-    /* Revalidate 'fullscreen' windows for ML and next: */
+    /* Revalidate native fullscreen for ML and next: */
     else revalidateNativeFullScreen();
 #else /* !Q_WS_MAC */
@@ -545 +550 @@
                     Qt::QueuedConnection);
         }
-        /* Revalidate 'fullscreen' windows: */
+        /* Revalidate native fullscreen: */
         revalidateNativeFullScreen();
     }
@@ -675 +680 @@
     if (uScreenID != 0 && !screensHaveSeparateSpaces())
     {
-        LogRel(("UIMachineLogicFullscreen::revalidateNativeFullScreen: "
-                "Ask machine-window #%d to show/normalize.\n", (int)uScreenID));
-
-        /* Make sure window have proper geometry: */
-        pMachineWindow->showInNecessaryMode();
+        /* If there is no fullscreen window or it's invalidated: */
+        if (m_fullscreenMachineWindows.isEmpty() || !m_invalidFullscreenMachineWindows.isEmpty())
+        {
+            LogRel(("UIMachineLogicFullscreen::revalidateNativeFullScreen: "
+                    "Ask transient machine-window #%d to hide.\n", (int)uScreenID));
+
+            pMachineWindow->hide();
+        }
+        /* If there is valid fullscreen window: */
+        else
+        {
+            LogRel(("UIMachineLogicFullscreen::revalidateNativeFullScreen: "
+                    "Ask transient machine-window #%d to show/normalize.\n", (int)uScreenID));
+
+            /* Make sure window have proper geometry and shown: */
+            pMachineWindow->showInNecessaryMode();
+        }
     }
     /* Validate window which can be fullscreen: */
@@ -712 +729 @@
                         "Ask machine-window #%d to hide.\n", (int)uScreenID));
 
-                /* Else make sure that window is hidden: */
-                pMachineWindow->showInNecessaryMode();
+                pMachineWindow->hide();
             }
         }
@@ -728 +744 @@
              * 1. shouldn't really be shown or
              * 2. isn't mapped to some host-screen or
-             * 3. should be located on another host-screen than currently or
-             * 4. have another frame-buffer size than actually should. */
+             * 3. should be located on another host-screen than currently. */
             if (   !uisession()->isScreenVisible(uScreenID)
                 || !hasHostScreenForGuestScreen(uScreenID)
-                || iWantedHostScreenIndex != iCurrentHostScreenIndex
-                || frameBufferSize != screenSize)
+                || iWantedHostScreenIndex != iCurrentHostScreenIndex)
             {
                 LogRel(("UIMachineLogicFullscreen::revalidateNativeFullScreen: "
@@ -744 +758 @@
                 emit sigNotifyAboutNativeFullscreenShouldBeExited(pMachineWindow);
             }
+
+            /* If that window
+             * 1. have another frame-buffer size than actually should. */
+            else if (frameBufferSize != screenSize)
+            {
+                LogRel(("UIMachineLogicFullscreen::revalidateNativeFullScreen: "
+                        "Ask machine-window #%d to adjust guest geometry.\n", (int)uScreenID));
+
+                /* Adjust guest screen size if necessary: */
+                pMachineWindow->machineView()->maybeAdjustGuestScreenSize();
+            }
         }
     }