Changeset 34168 in vbox for trunk/src/VBox

Timestamp:

Nov 18, 2010 12:48:19 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt4-OSX: fix selector pos/size on save/restore for newer Qt versions

File:

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

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

@@ -200 +200 @@
 #define BIG_TOOLBAR
 #if MAC_LEOPARD_STYLE
-    /* Enable unified toolbars on Mac OS X. Available on Qt >= 4.3 */
     addToolBar(mVMToolBar);
-    mVMToolBar->setMacToolbar();
     /* Central widget @ horizontal layout */
     setCentralWidget(m_pSplitter);
@@ -346 +344 @@
         {
             mNormalGeo.moveTo(x, y);
-            mNormalGeo.setSize(QSize(w, h).expandedTo(minimumSizeHint())
-                                          .boundedTo(ar.size()));
+            mNormalGeo.setSize(QSize(w, h)
+                               .expandedTo(minimumSizeHint())
+                               .boundedTo(ar.size()));
+#if defined(Q_WS_MAC) && (QT_VERSION >= 0x040700)
+            move(mNormalGeo.topLeft());
+            resize(mNormalGeo.size());
+            mNormalGeo = normalGeometry();
+#else /* defined(Q_WS_MAC) && (QT_VERSION >= 0x040700) */
             setGeometry(mNormalGeo);
+#endif /* !(defined(Q_WS_MAC) && (QT_VERSION >= 0x040700)) */
             if (max) /* maximize if needed */
                 showMaximized();
@@ -360 +365 @@
         }
     }
+#if MAC_LEOPARD_STYLE
+    /* Enable unified toolbars on Mac OS X. Available on Qt >= 4.3. We do this
+     * after setting the window pos/size, cause Qt sometime includes the
+     * toolbar height in the content height. */
+    mVMToolBar->setMacToolbar();
+#endif /* MAC_LEOPARD_STYLE */
 
     /* Update the list */
@@ -473 +484 @@
     /* Save the position of the window */
     {
-        int y = mNormalGeo.y();
+#if defined(Q_WS_MAC) && (QT_VERSION >= 0x040700)
+        QRect frameGeo = frameGeometry();
+        QRect save(frameGeo.x(), frameGeo.y(), mNormalGeo.width(), mNormalGeo.height());
+#else /* defined(Q_WS_MAC) && (QT_VERSION >= 0x040700) */
+        QRect save(mNormalGeo);
+#endif /* !(defined(Q_WS_MAC) && (QT_VERSION >= 0x040700)) */
         QString winPos = QString("%1,%2,%3,%4")
-            .arg(mNormalGeo.x()).arg(y)
-            .arg(mNormalGeo.width()).arg(mNormalGeo.height());
+            .arg(save.x()).arg(save.y())
+            .arg(save.width()).arg(save.height());
 #ifdef Q_WS_MAC
         UIWindowMenuManager::destroy();