Changeset 17147 in vbox for trunk

Timestamp:

Feb 26, 2009 9:33:38 AM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4-OSX: Enabled the settings animation in Cocoa again.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxUtils-darwin.h (modified) (3 diffs)
• src/VBoxSettingsDialog.cpp (modified) (4 diffs)
• src/darwin/VBoxUtils-darwin-carbon.cpp (modified) (2 diffs)
• src/darwin/VBoxUtils-darwin-cocoa.m (modified) (2 diffs)
• src/darwin/VBoxUtils-darwin.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxUtils-darwin.h

@@ -44 +44 @@
 class QToolBar;
 class QPixmap;
+class QRect;
 
 # ifdef QT_MAC_USE_COCOA
@@ -73 +74 @@
 void darwinSetMouseCoalescingEnabled (bool aEnabled);
 
+/********************************************************************************
+ *
+ * Simple helper methods (OS System native)
+ *
+ ********************************************************************************/
+void darwinWindowAnimateResizeImpl (NativeWindowRef aWindow, int x, int y, int width, int height);
+
 __END_DECLS
 
@@ -124 +132 @@
 QString darwinSystemLanguage (void);
 QPixmap darwinCreateDragPixmap (const QPixmap& aPixmap, const QString &aText);
+void darwinWindowAnimateResize (QWidget *aWidget, const QRect &aTarget);
 
 

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

@@ -276 +276 @@
     mStack->setCurrentIndex (mStack->indexOf (rootPage));
 #else /* Q_WS_MAC */
-# ifndef QT_MAC_USE_COCOA
     QSize cs = size();
     /* First make all fully resizeable */
@@ -300 +299 @@
         setFixedSize (ss);
     }
-# else /* QT_MAC_USE_COCOA */
-    for (int i = 0; i < mStack->count(); ++i)
-        mStack->widget (i)->setSizePolicy (QSizePolicy::Preferred, QSizePolicy::Preferred);
-    mStack->setCurrentIndex (mStack->indexOf (rootPage));
-# endif /* QT_MAC_USE_COCOA */
 #endif /* !Q_WS_MAC */
 # ifdef VBOX_GUI_WITH_TOOLBAR_SETTINGS
@@ -420 +414 @@
     int minWidth = mSelector->minWidth();
 #ifdef Q_WS_MAC
-# ifndef QT_MAC_USE_COCOA
     /* Set all size policies to ignored */
     for (int i = 0; i < mStack->count(); ++i)
@@ -438 +431 @@
 
     categoryChanged (mSelector->currentId());
-# else /* QT_MAC_USE_COCOA */
-    categoryChanged (mSelector->currentId());
-# endif /* QT_MAC_USE_COCOA */
 #else /* Q_WS_MAC */
     /* Resize to the minimum possible size */

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

@@ -45 +45 @@
 }
 
-
+void darwinWindowAnimateResizeImpl (NativeWindowRef aWidget, int x, int y, int width, int height)
+{
+    HIRect r = CGRectMake (x, y, width, height);
+    TransitionWindowWithOptions (aWidget, kWindowSlideTransitionEffect, kWindowResizeTransitionAction, &r, false, NULL);
+}
 
 
@@ -118 +122 @@
     Assert (!qpm.isNull());
     return ::darwinToCGImageRef (&qpm);
-}
-
-void darwinWindowAnimateResize (QWidget *aWidget, const QRect &aTarget)
-{
-    HIRect r = ::darwinToHIRect (aTarget);
-    TransitionWindowWithOptions (::darwinToNativeWindow (aWidget), kWindowSlideTransitionEffect, kWindowResizeTransitionAction, &r, false, NULL);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/darwin/VBoxUtils-darwin-cocoa.m

@@ -27 +27 @@
 #import <AppKit/NSView.h>
 #import <AppKit/NSEvent.h>
+#import <AppKit/NSToolbar.h>
 
 NativeWindowRef darwinToNativeWindowImpl (NativeViewRef aView)
@@ -50 +51 @@
 }
 
+void darwinWindowAnimateResizeImpl (NativeWindowRef aWindow, int x, int y, int width, int height)
+{
+    /* It seems that Qt doesn't return the height of the window with the
+     * toolbar height included. So add this size manually. Could easily be that
+     * the Trolls fix this in the final release. */
+    NSToolbar *toolbar = [aWindow toolbar];
+    NSRect windowFrame = [aWindow frame];
+    int toolbarHeight = 0;
+    if(toolbar && [toolbar isVisible])
+        toolbarHeight = NSHeight (windowFrame) - NSHeight ([[aWindow contentView] frame]);
+    int h = height + toolbarHeight;
+    int h1 = h - NSHeight (windowFrame);
+    windowFrame.size.height = h;
+    windowFrame.origin.y -= h1;
+
+    [aWindow setFrame:windowFrame display:YES animate:YES];
+}

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

@@ -45 +45 @@
 
 NativeWindowRef darwinToNativeWindow (NativeViewRef aView)
-{ 
+{
     return darwinToNativeWindowImpl (aView);
 }
@@ -54 +54 @@
     if (parent)
         darwinSetShowsToolbarButtonImpl (::darwinToNativeWindow (parent), aEnabled);
+}
+
+void darwinWindowAnimateResize (QWidget *aWidget, const QRect &aTarget)
+{
+    darwinWindowAnimateResizeImpl (::darwinToNativeWindow (aWidget), aTarget.x(), aTarget.y(), aTarget.width(), aTarget.height());
 }
 
@@ -107 +112 @@
     return dragPixmap;
 }
-
 
 /********************************************************************************