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

Timestamp:

Jan 24, 2017 10:50:34 AM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8636: X11: Runtime UI: Use the maximization approach for the seamless window representation. That allows to avoid Qt5/XCB conflicts while trying to move window of the maximum available size to appropriate position. WM doing that job instead.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp (modified) (2 diffs)

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

@@ -172 +172 @@
 void UIMachineWindowSeamless::placeOnScreen()
 {
+    /* Make sure this window has seamless logic: */
+    UIMachineLogicSeamless *pSeamlessLogic = qobject_cast<UIMachineLogicSeamless*>(machineLogic());
+    AssertPtrReturnVoid(pSeamlessLogic);
+
     /* Get corresponding host-screen: */
-    const int iHostScreen = qobject_cast<UIMachineLogicSeamless*>(machineLogic())->hostScreenForGuestScreen(m_uScreenId);
+    const int iHostScreen = pSeamlessLogic->hostScreenForGuestScreen(m_uScreenId);
     /* And corresponding working area: */
     const QRect workingArea = gpDesktop->availableGeometry(iHostScreen);
-
-    /* Set appropriate geometry for window: */
-    resize(workingArea.size());
-    move(workingArea.topLeft());
+    Q_UNUSED(workingArea);
+
+#if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
+
+    /* Make sure we are located on corresponding host-screen: */
+    if (   gpDesktop->screenCount() > 1
+        && (x() != workingArea.x() || y() != workingArea.y()))
+    {
+        // WORKAROUND:
+        // With Qt5 on X11 we can't just move the window onto desired host-screen if
+        // window size is more than the available geometry (working area) of that
+        // host-screen. So we are resizing it to a smaller size first of all:
+        const QSize newSize = workingArea.size() * .9;
+        LogRel(("GUI: UIMachineWindowSeamless::placeOnScreen: Resize window: %d to smaller size: %dx%d\n",
+                m_uScreenId, newSize.width(), newSize.height()));
+        resize(newSize);
+        /* Move window onto required screen: */
+        const QPoint newPosition = workingArea.topLeft();
+        LogRel(("GUI: UIMachineWindowSeamless::placeOnScreen: Move window: %d to: %dx%d\n",
+                m_uScreenId, newPosition.x(), newPosition.y()));
+        move(newPosition);
+    }
+
+#else
+
+    /* Set appropriate window geometry: */
+    const QSize newSize = workingArea.size();
+    LogRel(("GUI: UIMachineWindowSeamless::placeOnScreen: Resize window: %d to: %dx%d\n",
+            m_uScreenId, newSize.width(), newSize.height()));
+    resize(newSize);
+    const QPoint newPosition = workingArea.topLeft();
+    LogRel(("GUI: UIMachineWindowSeamless::placeOnScreen: Move window: %d to: %dx%d\n",
+            m_uScreenId, newPosition.x(), newPosition.y()));
+    move(newPosition);
+
+#endif
 }
 
@@ -212 +248 @@
         placeOnScreen();
 
-        /* Show window in normal mode: */
+#if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
+        /* Show window: */
+        if (!isMaximized())
+            showMaximized();
+#else
+        /* Show window: */
         show();
+#endif
 
         /* Restore minimized state if necessary: */