Changeset 48684 in vbox

Timestamp:

Sep 25, 2013 2:26:51 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: 6965: MacOS X host: VirtualBox Manager geometry restoring issue: Common logging first.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -1495 +1495 @@
     /* Restore window position: */
     {
+        /* Loading geometry: */
         QString strWinPos = vbox.GetExtraData(GUI_LastSelectorWindowPosition);
+        LogRelFlow(("UISelectorWindow: Loading geometry settings: {%s}\n", strWinPos.toAscii().constData()));
 
         bool ok = false, max = false;
@@ -1516 +1518 @@
             && (x + w > ar.left()) && (x < ar.right()) /* & horizontal bounds */)
         {
+            /* Apply loaded geometry: */
             m_normalGeo.moveTo(x, y);
             m_normalGeo.setSize(QSize(w, h).expandedTo(minimumSizeHint()).boundedTo(ar.size()));
-#if defined(Q_WS_MAC) && (QT_VERSION >= 0x040700)
+#ifdef Q_WS_MAC
             move(m_normalGeo.topLeft());
             resize(m_normalGeo.size());
             m_normalGeo = normalGeometry();
-#else /* defined(Q_WS_MAC) && (QT_VERSION >= 0x040700) */
+#else /* Q_WS_MAC */
             setGeometry(m_normalGeo);
-#endif /* !(defined(Q_WS_MAC) && (QT_VERSION >= 0x040700)) */
+#endif /* !Q_WS_MAC */
+            LogRelFlow(("UISelectorWindow: Geometry set to: %dx%d @ %dx%d.\n",
+                        m_normalGeo.x(), m_normalGeo.y(), m_normalGeo.width(), m_normalGeo.height()));
             if (max) /* maximize if needed */
                 showMaximized();
@@ -1530 +1535 @@
         else
         {
+            /* Apply default geometry: */
             m_normalGeo.setSize(QSize(770, 550).expandedTo(minimumSizeHint()).boundedTo(ar.size()));
             m_normalGeo.moveCenter(ar.center());
             setGeometry(m_normalGeo);
+            LogRelFlow(("UISelectorWindow: Geometry set to default because something was wrong: "
+                        "(loaded correctly = '%s', x = %d, y = %d, w = %d, h = %d)!\n",
+                        ok ? "true" : "false", x, y, w, h));
         }
     }
@@ -1565 +1574 @@
     /* Save window position: */
     {
-#if defined(Q_WS_MAC) && (QT_VERSION >= 0x040700)
+#ifdef Q_WS_MAC
         QRect frameGeo = frameGeometry();
         QRect save(frameGeo.x(), frameGeo.y(), m_normalGeo.width(), m_normalGeo.height());
-#else /* defined(Q_WS_MAC) && (QT_VERSION >= 0x040700) */
+#else /* Q_WS_MAC */
         QRect save(m_normalGeo);
-#endif /* !(defined(Q_WS_MAC) && (QT_VERSION >= 0x040700)) */
+#endif /* !Q_WS_MAC */
+        LogRelFlow(("UISelectorWindow: Saving geometry as: %dx%d @ %dx%d.\n",
+                    save.x(), save.y(), save.width(), save.height()));
         QString strWinPos = QString("%1,%2,%3,%4").arg(save.x()).arg(save.y()).arg(save.width()).arg(save.height());
 #ifdef Q_WS_MAC