Changeset 21034 in vbox

Timestamp:

Jun 29, 2009 3:36:04 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4-OSX: Fix initial window position for the selector & sub windows.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxGlobal.cpp (modified) (1 diff)
• VBoxSelectorWnd.cpp (modified) (1 diff)
• darwin/VBoxUtils-darwin-carbon.cpp (modified) (1 diff)
• darwin/VBoxUtils-darwin.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

@@ -3428 +3428 @@
     /* ensure the widget is within the available desktop area */
     QRect newGeo = normalizeGeometry (geo, deskGeo, aCanResize);
+#ifdef Q_WS_MAC
+    /* No idea why, but Qt doesn't respect if there is a unified toolbar on the
+     * ::move call. So manually add the height of the toolbar before setting
+     * the position. */
+    if (w)
+        newGeo.translate (0, ::darwinWindowToolBarHeight (aWidget));
+#endif /* Q_WS_MAC */
 
     aWidget->move (newGeo.topLeft());

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

@@ -717 +717 @@
     /* Save the position of the window */
     {
+        int y = mNormalGeo.y();
+#if defined (Q_WS_MAC) && !defined (QT_MAC_USE_COCOA)
+        /* The toolbar counts to the content not to the frame. Unfortunaly the
+         * toolbar isn't fully initialized when this window will be moved to
+         * the last position after VBox starting. As a workaround just do
+         * remove the toolbar height part when save the last position. */
+        y -= ::darwinWindowToolBarHeight (this);
+#endif /* Q_WS_MAC && !QT_MAC_USE_COCOA */
         QString winPos = QString ("%1,%2,%3,%4")
-            .arg (mNormalGeo.x()).arg (mNormalGeo.y())
+            .arg (mNormalGeo.x()).arg (y)
             .arg (mNormalGeo.width()).arg (mNormalGeo.height());
         if (isMaximized())

trunk/src/VBox/Frontends/VirtualBox/src/darwin/VBoxUtils-darwin-carbon.cpp

@@ -137 +137 @@
 //    HIWindowInvalidateShadow (::darwinToWindowRef (console->viewport()));
 //    ReshapeCustomWindow (::darwinToWindowRef (this));
+}
+
+int darwinWindowToolBarHeight (NativeWindowRef aWindow)
+{
+    int h = 0;
+    if (::IsWindowToolbarVisible (aWindow))
+    {
+        /* Seems there is no method for getting the height of a toolbar in
+         * Carbon directly. Calculate it by getting the full window size,
+         * without the titlebar height & the content height. */
+        HIRect win, win1, win2;
+        if (OSStatus result = ::HIWindowGetBounds (aWindow, kWindowStructureRgn, kHICoordSpaceWindow, &win) == noErr)
+            if((result = ::HIWindowGetBounds (aWindow, kWindowTitleBarRgn, kHICoordSpaceWindow, &win1)) == noErr)
+                if ((result = ::HIWindowGetBounds (aWindow, kWindowContentRgn, kHICoordSpaceWindow, &win2)) == noErr)
+                    h = win.size.height - win1.size.height - win2.size.height;
+    }
+    return h;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/darwin/VBoxUtils-darwin.cpp

@@ -138 +138 @@
     QApplication::instance()->setAttribute (Qt::AA_DontShowIconsInMenus, true);
 #endif /* QT_VERSION >= 0x040400 */
+}
+
+int darwinWindowToolBarHeight (QWidget *aWidget)
+{
+#ifndef QT_MAC_USE_COCOA
+    return ::darwinWindowToolBarHeight (::darwinToNativeWindow (aWidget));
+#else /* QT_MAC_USE_COCOA */
+    NOREF (aWidget);
+    return 0;
+#endif /* QT_MAC_USE_COCOA */
 }