Changeset 57043 in vbox for trunk

Timestamp:

Jul 21, 2015 2:01:18 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Visual-mode adjustment code: Separate code reordering for r101761 to keep it clear.

Location:

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

Files:

• fullscreen/UIMachineWindowFullscreen.cpp (modified) (4 diffs)
• seamless/UIMachineWindowSeamless.cpp (modified) (1 diff)

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

@@ -313 +313 @@
     const QRect workingArea = QApplication::desktop()->screenGeometry(iHostScreen);
 
-#ifdef Q_WS_MAC
+#ifndef Q_WS_MAC
+    /* Set appropriate geometry for window: */
+    move(workingArea.topLeft());
+    resize(workingArea.size());
+#else /* Q_WS_MAC */
     /* Make sure this window has fullscreen logic: */
     UIMachineLogicFullscreen *pFullscreenLogic = qobject_cast<UIMachineLogicFullscreen*>(machineLogic());
@@ -345 +349 @@
         setGeometry(geo);
     }
-#else /* !Q_WS_MAC */
-    /* Set appropriate geometry for window: */
-    move(workingArea.topLeft());
-    resize(workingArea.size());
-#endif /* !Q_WS_MAC */
+#endif /* Q_WS_MAC */
 }
 
@@ -375 +375 @@
         }
 #endif /* Q_WS_WIN || Q_WS_X11 */
+
         /* Hide window: */
         hide();
-        return;
-    }
-
-    /* Ignore if window minimized: */
-    if (isMinimized())
-        return;
+    }
+    else
+    {
+        /* Ignore if window minimized: */
+        if (isMinimized())
+            return;
 
 #ifdef Q_WS_X11
-    /* On X11 calling placeOnScreen() is only needed for legacy window managers
-     * which we do not test, so this is 'best effort' code. With window managers which
-     * support the _NET_WM_FULLSCREEN_MONITORS protocol this would interfere unreliable. */
-    const bool fSupportsNativeFullScreen = VBoxGlobal::supportsFullScreenMonitorsProtocolX11() &&
-                                           !gEDataManager->legacyFullscreenModeRequested();
-    if (!fSupportsNativeFullScreen)
-        placeOnScreen();
-#else /* !Q_WS_X11 */
-    /* Make sure window is maximized and placed on valid screen: */
-    placeOnScreen();
-#endif /* !Q_WS_X11 */
-
-#ifdef Q_WS_MAC
-    /* 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(): */
-    if (fSupportsNativeFullScreen)
-        show();
-    else
-        showFullScreen();
-#else /* !Q_WS_MAC */
-    /* Show in fullscreen mode: */
-    showFullScreen();
-#endif /* !Q_WS_MAC */
-
-#ifdef Q_WS_X11
-    if (fSupportsNativeFullScreen)
-    {
-        /* Tell recent window managers which screen this window should be mapped to.
-         * Apparently some window managers will not respond to requests for
-         * unmapped windows, so do this *after* the call to showFullScreen(). */
-        VBoxGlobal::setFullScreenMonitorX11(this, pFullscreenLogic->hostScreenForGuestScreen(m_uScreenId));
-    }
-    else
-    {
         /* On X11 calling placeOnScreen() is only needed for legacy window managers
          * which we do not test, so this is 'best effort' code. With window managers which
          * support the _NET_WM_FULLSCREEN_MONITORS protocol this would interfere unreliable. */
+        const bool fSupportsNativeFullScreen = VBoxGlobal::supportsFullScreenMonitorsProtocolX11() &&
+                                               !gEDataManager->legacyFullscreenModeRequested();
+        if (!fSupportsNativeFullScreen)
+            placeOnScreen();
+#else /* !Q_WS_X11 */
+        /* Make sure window is maximized and placed on valid screen: */
         placeOnScreen();
-    }
+#endif /* !Q_WS_X11 */
+
+#ifdef Q_WS_MAC
+        /* 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(): */
+        if (fSupportsNativeFullScreen)
+            show();
+        else
+            showFullScreen();
+#else /* !Q_WS_MAC */
+        /* Show in fullscreen mode: */
+        showFullScreen();
+#endif /* !Q_WS_MAC */
+
+#ifdef Q_WS_X11
+        if (fSupportsNativeFullScreen)
+        {
+            /* Tell recent window managers which screen this window should be mapped to.
+             * Apparently some window managers will not respond to requests for
+             * unmapped windows, so do this *after* the call to showFullScreen(). */
+            VBoxGlobal::setFullScreenMonitorX11(this, pFullscreenLogic->hostScreenForGuestScreen(m_uScreenId));
+        }
+        else
+        {
+            /* On X11 calling placeOnScreen() is only needed for legacy window managers
+             * which we do not test, so this is 'best effort' code. With window managers which
+             * support the _NET_WM_FULLSCREEN_MONITORS protocol this would interfere unreliable. */
+            placeOnScreen();
+        }
 #endif /* Q_WS_X11 */
 
@@ -430 +431 @@
 
 #if defined(Q_WS_WIN) || defined(Q_WS_X11)
-    /* If there is a mini-toolbar: */
-    if (m_pMiniToolBar)
-    {
+        /* If there is a mini-toolbar: */
+        if (m_pMiniToolBar)
+        {
 # if   defined(Q_WS_WIN)
-        /* Show mini-toolbar: */
-        m_pMiniToolBar->show();
+            /* Show mini-toolbar: */
+            m_pMiniToolBar->show();
 # elif defined(Q_WS_X11)
-        /* Allow mini-toolbar to be located on full-screen area: */
-        m_pMiniToolBar->showFullScreen();
-        /* On modern window managers: */
-        if (fSupportsNativeFullScreen)
-        {
-            /* We also can map mini-toolbar directly on corresponding machine-window: */
-            VBoxGlobal::setFullScreenMonitorX11(m_pMiniToolBar, pFullscreenLogic->hostScreenForGuestScreen(m_uScreenId));
+            /* Allow mini-toolbar to be located on full-screen area: */
+            m_pMiniToolBar->showFullScreen();
+            /* On modern window managers: */
+            if (fSupportsNativeFullScreen)
+            {
+                /* We also can map mini-toolbar directly on corresponding machine-window: */
+                VBoxGlobal::setFullScreenMonitorX11(m_pMiniToolBar, pFullscreenLogic->hostScreenForGuestScreen(m_uScreenId));
+            }
+# endif /* Q_WS_X11 */
         }
-# endif /* Q_WS_X11 */
-    }
-#endif /* Q_WS_WIN || Q_WS_X11 */
-
-    /* Make sure machine-view have focus: */
-    m_pMachineView->setFocus();
+#endif /* Q_WS_WIN || Q_WS_X11 */
+
+        /* Make sure machine-view have focus: */
+        m_pMachineView->setFocus();
+    }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp

@@ -205 +205 @@
         }
 #endif /* Q_WS_WIN || Q_WS_X11 */
+
         /* Hide window: */
         hide();
-        return;
-    }
-
-    /* Ignore if window minimized: */
-    if (isMinimized())
-        return;
-
-    /* Make sure window have appropriate geometry: */
-    placeOnScreen();
-
-    /* Show in normal mode: */
-    show();
-
-    /* Adjust machine-view size if necessary: */
-    adjustMachineViewSize();
-
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
-    /* If there is a mini-toolbar: */
-    if (m_pMiniToolBar)
-    {
+    }
+    else
+    {
+        /* Ignore if window minimized: */
+        if (isMinimized())
+            return;
+
+        /* Make sure window have appropriate geometry: */
+        placeOnScreen();
+
+        /* Show in normal mode: */
+        show();
+
+        /* Adjust machine-view size if necessary: */
+        adjustMachineViewSize();
+
+#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+        /* If there is a mini-toolbar: */
+        if (m_pMiniToolBar)
+        {
 # if   defined(Q_WS_WIN)
-        /* Show mini-toolbar: */
-        m_pMiniToolBar->show();
+            /* Show mini-toolbar: */
+            m_pMiniToolBar->show();
 # elif defined(Q_WS_X11)
-        /* Allow mini-toolbar to be located on available area: */
-        m_pMiniToolBar->showMaximized();
+            /* Allow mini-toolbar to be located on available area: */
+            m_pMiniToolBar->showMaximized();
 # endif /* Q_WS_X11 */
-    }
-#endif /* Q_WS_WIN || Q_WS_X11 */
-
-    /* Make sure machine-view have focus: */
-    m_pMachineView->setFocus();
+        }
+#endif /* Q_WS_WIN || Q_WS_X11 */
+
+        /* Make sure machine-view have focus: */
+        m_pMachineView->setFocus();
+    }
 }