Changeset 61585 in vbox for trunk/src/VBox

Timestamp:

Jun 8, 2016 3:19:05 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8422: Runtime UI: Full-screen window: Mapping windows instead of moving for Qt5.

File:

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

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

@@ -23 +23 @@
 # include <QMenu>
 # include <QTimer>
+# ifdef VBOX_WS_WIN
+#  if QT_VERSION >= 0x050000
+#   include <QWindow>
+#  endif /* QT_VERSION >= 0x050000 */
+# endif /* VBOX_WS_WIN */
 
 /* GUI includes: */
@@ -389 +394 @@
 #elif defined(VBOX_WS_WIN)
 
-    /* Set appropriate geometry for window: */
+# if QT_VERSION >= 0x050000
+    /* Map window onto required screen: */
+    windowHandle()->setScreen(qApp->screens().at(iHostScreen));
+# endif /* QT_VERSION >= 0x050000 */
+    /* Set appropriate window size: */
     resize(workingArea.size());
+# if QT_VERSION < 0x050000
+    /* Move window onto required screen: */
     move(workingArea.topLeft());
+# endif /* QT_VERSION < 0x050000 */
 
     /* If there is a mini-toolbar: */
     if (m_pMiniToolBar)
     {
-        /* Set appropriate geometry for mini-toolbar: */
+# if QT_VERSION >= 0x050000
+        /* Map mini-toolbar onto required screen: */
+        m_pMiniToolBar->windowHandle()->setScreen(qApp->screens().at(iHostScreen));
+# endif /* QT_VERSION >= 0x050000 */
+        /* Set appropriate mini-toolbar size: */
         m_pMiniToolBar->resize(workingArea.size());
+# if QT_VERSION < 0x050000
+        /* Move mini-toolbar onto required screen: */
         m_pMiniToolBar->move(workingArea.topLeft());
+# endif /* QT_VERSION < 0x050000 */
     }