Changeset 59507 in vbox

Timestamp:

Jan 28, 2016 12:58:06 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:7839: Extra-Data Manager: Position off-screen windows to be fully visible again on relaunch.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -2319 +2319 @@
                                           vboxGlobal().availableGeometry();
 
+    /* In Windows Qt fails to reposition out of screen window properly, so moving to centre: */
+#ifdef Q_WS_WIN
     /* Make sure resulting geometry is within current bounds: */
-    geometry = geometry.intersected(availableGeometry);
+    if (fOk && geometry.intersects(availableGeometry))
+        geometry.moveCenter(availableGeometry.center());
+#endif /* Q_WS_WIN */
 
     /* Move default-geometry to screen-geometry' center: */
@@ -3523 +3527 @@
         geometry.setSize(geometry.size().expandedTo(pWidget->minimumSizeHint()));
 
-    /* Get screen-geometry [of screen with point (iX, iY) if possible]: */
+    /* In Windows Qt fails to reposition out of screen window properly, so moving to centre: */
+#ifdef Q_WS_WIN
+    /* Get available-geometry [of screen with point (iX, iY) if possible]: */
     const QRect availableGeometry = fOk ? vboxGlobal().availableGeometry(QPoint(iX, iY)) :
                                           vboxGlobal().availableGeometry();
 
     /* Make sure resulting geometry is within current bounds: */
-    geometry = geometry.intersected(availableGeometry);
+    if (fOk && geometry.intersects(availableGeometry))
+        geometry.moveCenter(availableGeometry.center());
+#endif /* Q_WS_WIN */
 
     /* Move default-geometry to pParentWidget' geometry center: */
@@ -3675 +3683 @@
         geometry.setSize(geometry.size().expandedTo(pWidget->minimumSizeHint()));
 
-    /* Get screen-geometry [of screen with point (iX, iY) if possible]: */
+    /* Get available-geometry [of screen with point (iX, iY) if possible]: */
     const QRect availableGeometry = fOk ? vboxGlobal().availableGeometry(QPoint(iX, iY)) :
                                           vboxGlobal().availableGeometry();
 
+    /* In Windows Qt fails to reposition out of screen window properly, so moving to centre: */
+#ifdef Q_WS_WIN
     /* Make sure resulting geometry is within current bounds: */
-    geometry = geometry.intersected(availableGeometry);
+    if (fOk && geometry.intersects(availableGeometry))
+        geometry.moveCenter(availableGeometry.center());
+#endif /* Q_WS_WIN */
 
     /* Move default-geometry to current screen center: */