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

Timestamp:

Feb 18, 2016 3:19:41 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: ​bugref:7839: Extra-Data Manager: Adding fallback option to move center of log-window and information-window to center of default-screen.

File:

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

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

@@ -2315 +2315 @@
         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();
@@ -2326 +2326 @@
 #endif /* Q_WS_WIN */
 
-    /* Move default-geometry to screen-geometry' center: */
+    /* As final fallback, move default-geometry to available-geometry' center: */
     if (!fOk)
         geometry.moveCenter(availableGeometry.center());
@@ -3527 +3527 @@
         geometry.setSize(geometry.size().expandedTo(pWidget->minimumSizeHint()));
 
-    /* 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();
 
+    /* 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: */
     if (fOk && geometry.intersects(availableGeometry))
@@ -3538 +3538 @@
 #endif /* Q_WS_WIN */
 
-    /* Move default-geometry to pParentWidget' geometry center: */
+    /* As a fallback, move default-geometry to pParentWidget' geometry center: */
     if (!fOk && pParentWidget)
         geometry.moveCenter(pParentWidget->geometry().center());
+    /* As final fallback, move default-geometry to available-geometry' center: */
+    else if (!fOk)
+        geometry.moveCenter(availableGeometry.center());
 
     /* Return result: */
@@ -3694 +3697 @@
 #endif /* Q_WS_WIN */
 
-    /* Move default-geometry to current screen center: */
+    /* As final fallback, move default-geometry to available-geometry' center: */
     if (!fOk)
         geometry.moveCenter(availableGeometry.center());
@@ -3802 +3805 @@
     /* In Windows Qt fails to reposition out of screen window properly, so moving to centre: */
 #ifdef Q_WS_WIN
-    /* Get screen-geometry [of screen with point (iX, iY) if possible]: */
-    const QRect availableGeometry = vboxGlobal().availableGeometry(QPoint(iX, iY));
+    /* 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: */