Changeset 59985 in vbox

Timestamp:

Mar 11, 2016 11:18:39 AM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:7839: Extra-Data Manager: Position off-screen windows to be fully visible again on relaunch in consistent with default-behavior on OS X and X11.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp (modified) (5 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: */
+    /* In Windows Qt fails to reposition out of screen window properly, so doing it ourselves: */
 #ifdef Q_WS_WIN
     /* Make sure resulting geometry is within current bounds: */
-    if (fOk && !availableGeometry.contains(geometry, true))
-        geometry.moveCenter(availableGeometry.center());
+    if (fOk && !availableGeometry.contains(geometry))
+        geometry = VBoxGlobal::getNormalized(geometry, QRegion(availableGeometry));
 #endif /* Q_WS_WIN */
 
@@ -3531 +3531 @@
                                           vboxGlobal().availableGeometry();
 
-    /* In Windows Qt fails to reposition out of screen window properly, so moving to centre: */
+    /* In Windows Qt fails to reposition out of screen window properly, so doing it ourselves: */
 #ifdef Q_WS_WIN
     /* Make sure resulting geometry is within current bounds: */
-    if (fOk && !availableGeometry.contains(geometry, true))
-        geometry.moveCenter(availableGeometry.center());
+    if (fOk && !availableGeometry.contains(geometry))
+        geometry = VBoxGlobal::getNormalized(geometry, QRegion(availableGeometry));
 #endif /* Q_WS_WIN */
 
@@ -3690 +3690 @@
                                           vboxGlobal().availableGeometry();
 
-    /* In Windows Qt fails to reposition out of screen window properly, so moving to centre: */
+    /* In Windows Qt fails to reposition out of screen window properly, so doing it ourselves: */
 #ifdef Q_WS_WIN
     /* Make sure resulting geometry is within current bounds: */
-    if (fOk && !availableGeometry.contains(geometry, true))
-        geometry.moveCenter(availableGeometry.center());
+    if (fOk && !availableGeometry.contains(geometry))
+        geometry = VBoxGlobal::getNormalized(geometry, QRegion(availableGeometry));
 #endif /* Q_WS_WIN */
 
@@ -3803 +3803 @@
         geometry.setSize(geometry.size().expandedTo(pWidget->minimumSizeHint()));
 
-    /* In Windows Qt fails to reposition out of screen window properly, so moving to centre: */
+    /* In Windows Qt fails to reposition out of screen window properly, so doing it ourselves: */
 #ifdef Q_WS_WIN
     /* Get available-geometry [of screen with point (iX, iY) if possible]: */
@@ -3810 +3810 @@
 
     /* Make sure resulting geometry is within current bounds: */
-    if (!availableGeometry.contains(geometry, true))
-        geometry.moveCenter(defaultGeometry.center());
+    if (!availableGeometry.contains(geometry))
+        geometry = VBoxGlobal::getNormalized(geometry, QRegion(availableGeometry));
 #endif /* Q_WS_WIN */