Changeset 48686 in vbox for trunk

Timestamp:

Sep 25, 2013 2:35:43 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: 6965: MacOS X host: VirtualBox Manager geometry restoring issue: Trying to fix.

File:

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

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

@@ -978 +978 @@
         case QEvent::Resize:
         {
-            QResizeEvent *pResizeEvent = (QResizeEvent*) pEvent;
-            if ((windowState() & (Qt::WindowMaximized | Qt::WindowMinimized | Qt::WindowFullScreen)) == 0)
+            if (isVisible() && (windowState() & (Qt::WindowMaximized | Qt::WindowMinimized | Qt::WindowFullScreen)) == 0)
+            {
+                QResizeEvent *pResizeEvent = static_cast<QResizeEvent*>(pEvent);
                 m_normalGeo.setSize(pResizeEvent->size());
+            }
             break;
         }
         case QEvent::Move:
         {
-            if ((windowState() & (Qt::WindowMaximized | Qt::WindowMinimized | Qt::WindowFullScreen)) == 0)
+            if (isVisible() && (windowState() & (Qt::WindowMaximized | Qt::WindowMinimized | Qt::WindowFullScreen)) == 0)
+            {
+#ifdef Q_WS_MAC
+                QMoveEvent *pMoveEvent = static_cast<QMoveEvent*>(pEvent);
+                m_normalGeo.moveTo(pMoveEvent->pos());
+#else /* Q_WS_MAC */
                 m_normalGeo.moveTo(geometry().x(), geometry().y());
+#endif /* !Q_WS_MAC */
+            }
             break;
         }
@@ -1524 +1533 @@
             move(m_normalGeo.topLeft());
             resize(m_normalGeo.size());
-            m_normalGeo = normalGeometry();
 #else /* Q_WS_MAC */
             setGeometry(m_normalGeo);
@@ -1574 +1582 @@
     /* Save window position: */
     {
-#ifdef Q_WS_MAC
-        QRect frameGeo = frameGeometry();
-        QRect save(frameGeo.x(), frameGeo.y(), m_normalGeo.width(), m_normalGeo.height());
-#else /* Q_WS_MAC */
         QRect save(m_normalGeo);
-#endif /* !Q_WS_MAC */
-        LogRelFlow(("UISelectorWindow: Saving geometry as: %dx%d @ %dx%d.\n",
+        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());