Changeset 61726 in vbox

Timestamp:

Jun 15, 2016 4:51:21 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8422: Runtime UI: Full-screen window: Small OSX cleanup for r107925 and r108089.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp (modified) (3 diffs)

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

@@ -337 +337 @@
     if (vboxGlobal().osRelease() <= MacOSXRelease_Lion)
         resize(workingArea.size());
-    /* Resize window to the appropriate size on ML and next
-     * only if that screen has no own user-space: */
+    /* Resize window to the appropriate size on ML and next if it's screen has no own user-space: */
     else if (!pFullscreenLogic->screensHaveSeparateSpaces() && m_uScreenId != 0)
         resize(workingArea.size());
@@ -351 +350 @@
             geo = QRect(QPoint(0, 0), QSize(pFrameBuffer->width(), pFrameBuffer->height()).boundedTo(workingArea.size()));
         }
-        /* If frame-buffer size is null => use default size: */
+        /* If normal geometry still null => use default size: */
         if (geo.isNull())
             geo = QRect(QPoint(0, 0), QSize(800, 600).boundedTo(workingArea.size()));
@@ -429 +428 @@
         placeOnScreen();
 
-        /* ML and next using native stuff, so we can call for simple show(),
-         * Lion and previous using Qt stuff, so we should call for showFullScreen(): */
-        const bool fSupportsNativeFullScreen = vboxGlobal().osRelease() > MacOSXRelease_Lion;
-        if (fSupportsNativeFullScreen)
-        {
-            /* Show window in normal mode: */
+        /* Simple show() for ML and next, showFullScreen() otherwise: */
+        if (vboxGlobal().osRelease() > MacOSXRelease_Lion)
             show();
-        }
         else
-        {
-            /* Show window in fullscreen mode: */
             showFullScreen();
-        }
 
         /* Adjust machine-view size if necessary: */