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

Timestamp:

Oct 18, 2019 1:04:17 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

134066

Message:

FE/Qt: UIExtraDataManager: Adjusting geometry restore logic for VirtualBox Manager, Extra-data Manager and Session Information dialog.

File:

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

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

@@ -2672 +2672 @@
         geometry.setSize(geometry.size().expandedTo(pWidget->minimumSizeHint()));
 
+    /* As final fallback, move default-geometry to available-geometry' center: */
+    if (!fOk)
+        geometry.moveCenter(availableGeometry.center());
+
     /* In Windows Qt fails to reposition out of screen window properly, so doing it ourselves: */
 #ifdef VBOX_WS_WIN
     /* Make sure resulting geometry is within current bounds: */
-    if (fOk && !availableGeometry.contains(geometry))
+    if (!availableGeometry.contains(geometry))
         geometry = UICommon::getNormalized(geometry, QRegion(availableGeometry));
 #endif /* VBOX_WS_WIN */
-
-    /* As final fallback, move default-geometry to available-geometry' center: */
-    if (!fOk)
-        geometry.moveCenter(availableGeometry.center());
 
     /* Return result: */
@@ -4122 +4122 @@
         geometry.setSize(geometry.size().expandedTo(pWidget->minimumSizeHint()));
 
-    /* In Windows Qt fails to reposition out of screen window properly, so doing it ourselves: */
-#ifdef VBOX_WS_WIN
-    /* Make sure resulting geometry is within current bounds: */
-    if (fOk && !availableGeometry.contains(geometry))
-        geometry = UICommon::getNormalized(geometry, QRegion(availableGeometry));
-#endif /* VBOX_WS_WIN */
-
     /* As a fallback, move default-geometry to pParentWidget' geometry center: */
     if (!fOk && pParentWidget)
@@ -4135 +4128 @@
     else if (!fOk)
         geometry.moveCenter(availableGeometry.center());
+
+    /* In Windows Qt fails to reposition out of screen window properly, so doing it ourselves: */
+#ifdef VBOX_WS_WIN
+    /* Make sure resulting geometry is within current bounds: */
+    if (!availableGeometry.contains(geometry))
+        geometry = UICommon::getNormalized(geometry, QRegion(availableGeometry));
+#endif /* VBOX_WS_WIN */
 
     /* Return result: */
@@ -4456 +4456 @@
                                           gpDesktop->availableGeometry();
 
+    /* As final fallback, move default-geometry to available-geometry' center: */
+    if (!fOk)
+        geometry.moveCenter(availableGeometry.center());
+
     /* In Windows Qt fails to reposition out of screen window properly, so doing it ourselves: */
 #ifdef VBOX_WS_WIN
     /* Make sure resulting geometry is within current bounds: */
-    if (fOk && !availableGeometry.contains(geometry))
+    if (!availableGeometry.contains(geometry))
         geometry = UICommon::getNormalized(geometry, QRegion(availableGeometry));
 #endif /* VBOX_WS_WIN */
-
-    /* As final fallback, move default-geometry to available-geometry' center: */
-    if (!fOk)
-        geometry.moveCenter(availableGeometry.center());
 
     /* Return result: */