Changeset 61748 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jun 17, 2016 2:32:26 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

108135

Message:

FE/Qt: bugref:8422: Runtime UI: Full-screen window: X11 multi-screen adjustments according to Qt5 requirements.

File:

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

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

@@ -319 +319 @@
 void UIMachineWindowFullscreen::placeOnScreen()
 {
+    /* Make sure this window has fullscreen logic: */
+    UIMachineLogicFullscreen *pFullscreenLogic = qobject_cast<UIMachineLogicFullscreen*>(machineLogic());
+    AssertPtrReturnVoid(pFullscreenLogic);
+
     /* Get corresponding host-screen: */
-    const int iHostScreen = qobject_cast<UIMachineLogicFullscreen*>(machineLogic())->hostScreenForGuestScreen(m_uScreenId);
+    const int iHostScreen = pFullscreenLogic->hostScreenForGuestScreen(m_uScreenId);
     /* And corresponding working area: */
     const QRect workingArea = vboxGlobal().screenGeometry(iHostScreen);
@@ -326 +330 @@
 
 #if defined(VBOX_WS_MAC)
-
-    /* Make sure this window has fullscreen logic: */
-    UIMachineLogicFullscreen *pFullscreenLogic = qobject_cast<UIMachineLogicFullscreen*>(machineLogic());
-    AssertPtrReturnVoid(pFullscreenLogic);
 
     /* Move window to the appropriate position: */
@@ -388 +388 @@
 #elif defined(VBOX_WS_X11)
 
+    /* Determine whether we should use the native full-screen mode: */
+    const bool fUseNativeFullScreen = VBoxGlobal::supportsFullScreenMonitorsProtocolX11() &&
+                                      !gEDataManager->legacyFullscreenModeRequested();
+    if (fUseNativeFullScreen)
+    {
+        /* Tell recent window managers which host-screen this window should be mapped to: */
+        VBoxGlobal::setFullScreenMonitorX11(this, pFullscreenLogic->hostScreenForGuestScreen(m_uScreenId));
+
+        /* If there is a mini-toolbar: */
+        if (m_pMiniToolBar)
+        {
+            /* Tell recent window managers which host-screen this mini-toolbar should be mapped to: */
+            VBoxGlobal::setFullScreenMonitorX11(m_pMiniToolBar, pFullscreenLogic->hostScreenForGuestScreen(m_uScreenId));
+        }
+    }
+
     /* Set appropriate geometry for window: */
     resize(workingArea.size());
@@ -526 +542 @@
             return;
 
-        /* If WM doesn't support native stuff, we need to call for placeOnScreen(): */
-        const bool fUseNativeFullScreen = VBoxGlobal::supportsFullScreenMonitorsProtocolX11() &&
-                                          !gEDataManager->legacyFullscreenModeRequested();
-        if (!fUseNativeFullScreen)
-        {
-            /* Make sure window have appropriate geometry: */
-            placeOnScreen();
-        }
-
         /* Show window: */
         showFullScreen();
@@ -545 +552 @@
         }
 
+        /* Make sure window have appropriate geometry: */
+        placeOnScreen();
+
         /* Restore minimized state if necessary: */
         if (m_fWasMinimized)
@@ -550 +560 @@
             m_fWasMinimized = false;
             showMinimized();
-        }
-
-        /* If WM supports native stuff, we need to map window to corresponding host-screen. */
-        if (fUseNativeFullScreen)
-        {
-            /* Tell recent window managers which host-screen this window should be mapped to: */
-            VBoxGlobal::setFullScreenMonitorX11(this, pFullscreenLogic->hostScreenForGuestScreen(m_uScreenId));
-
-            /* If there is a mini-toolbar: */
-            if (m_pMiniToolBar)
-            {
-                /* Tell recent window managers which host-screen this mini-toolbar should be mapped to: */
-                VBoxGlobal::setFullScreenMonitorX11(m_pMiniToolBar, pFullscreenLogic->hostScreenForGuestScreen(m_uScreenId));
-            }
         }