Changeset 61583 in vbox for trunk/src/VBox

Timestamp:

Jun 8, 2016 3:03:01 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8422: Runtime UI: Full-screen window: Splitting the placeOnScreen() code into usual platform threads.

File:

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

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

@@ -351 +351 @@
     /* And corresponding working area: */
     const QRect workingArea = vboxGlobal().screenGeometry(iHostScreen);
-
-#if   defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
-    /* Set appropriate geometry for window: */
-    resize(workingArea.size());
-    move(workingArea.topLeft());
-
-    /* If there is a mini-toolbar: */
-    if (m_pMiniToolBar)
-    {
-        /* Set appropriate geometry for mini-toolbar: */
-        m_pMiniToolBar->resize(workingArea.size());
-        m_pMiniToolBar->move(workingArea.topLeft());
-    }
-#elif defined(VBOX_WS_MAC)
+    Q_UNUSED(workingArea);
+
+#if defined(VBOX_WS_MAC)
+
     /* Make sure this window has fullscreen logic: */
     UIMachineLogicFullscreen *pFullscreenLogic = qobject_cast<UIMachineLogicFullscreen*>(machineLogic());
@@ -396 +386 @@
         setGeometry(geo);
     }
-#endif /* VBOX_WS_MAC */
+
+#elif defined(VBOX_WS_WIN)
+
+    /* Set appropriate geometry for window: */
+    resize(workingArea.size());
+    move(workingArea.topLeft());
+
+    /* If there is a mini-toolbar: */
+    if (m_pMiniToolBar)
+    {
+        /* Set appropriate geometry for mini-toolbar: */
+        m_pMiniToolBar->resize(workingArea.size());
+        m_pMiniToolBar->move(workingArea.topLeft());
+    }
+
+#elif defined(VBOX_WS_X11)
+
+    /* Set appropriate geometry for window: */
+    resize(workingArea.size());
+    move(workingArea.topLeft());
+
+    /* If there is a mini-toolbar: */
+    if (m_pMiniToolBar)
+    {
+        /* Set appropriate geometry for mini-toolbar: */
+        m_pMiniToolBar->resize(workingArea.size());
+        m_pMiniToolBar->move(workingArea.topLeft());
+    }
+
+#else
+
+# warning "port me"
+
+#endif
 }