儲存庫 vbox 的更動 17150

時間撮記:

2009-2-26 上午10:40:43 (16 年 以前)

作者:

vboxsync

訊息:

FE/Qt4-OSX: Removed unnecessary title bar buttons & resize indicator on Cocoa.

位置:

trunk/src/VBox/Frontends/VirtualBox

檔案:

• include/VBoxUtils-darwin.h (修改) (3 筆差異)
• src/QIDialog.cpp (修改) (1 筆差異)
• src/VBoxSettingsDialog.cpp (修改) (2 筆差異)
• src/darwin/VBoxUtils-darwin-carbon.cpp (修改) (3 筆差異)
• src/darwin/VBoxUtils-darwin-cocoa.m (修改) (3 筆差異)
• src/darwin/VBoxUtils-darwin.cpp (修改) (2 筆差異)

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

@@ -72 +72 @@
  ********************************************************************************/
 void darwinSetShowsToolbarButtonImpl (NativeWindowRef aWindow, bool aEnabled);
+void darwinSetShowsResizeIndicatorImpl (NativeWindowRef aWindow, bool aEnabled);
+void darwinSetHidesAllTitleButtonsImpl (NativeWindowRef aWindow);
 void darwinSetMouseCoalescingEnabled (bool aEnabled);
 
@@ -123 +125 @@
  ********************************************************************************/
 void darwinSetShowsToolbarButton (QToolBar *aToolBar, bool aEnabled);
+void darwinSetShowsResizeIndicator (QWidget *aWidget, bool aEnabled);
+void darwinSetHidesAllTitleButtons (QWidget *aWidget);
 void darwinDisableIconsInMenus (void);
 
@@ -130 +134 @@
  *
  ********************************************************************************/
+void darwinWindowAnimateResize (QWidget *aWidget, const QRect &aTarget);
 QString darwinSystemLanguage (void);
 QPixmap darwinCreateDragPixmap (const QPixmap& aPixmap, const QString &aText);
-void darwinWindowAnimateResize (QWidget *aWidget, const QRect &aTarget);
 
 

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

@@ -47 +47 @@
         setFixedSize (size());
 #ifdef Q_WS_MAC
-# ifdef QT_MAC_USE_COCOA
-        /** @todo Carbon -> Cocoa */
-# else
-        ChangeWindowAttributes (::darwinToNativeWindow (this), kWindowNoAttributes, kWindowResizableAttribute);
-# endif
+        ::darwinSetShowsResizeIndicator (this, false);
 #endif /* Q_WS_MAC */
     }

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

@@ -299 +299 @@
         setFixedSize (ss);
     }
+    ::darwinSetShowsResizeIndicator (this, false);
 #endif /* !Q_WS_MAC */
 # ifdef VBOX_GUI_WITH_TOOLBAR_SETTINGS
@@ -414 +415 @@
     int minWidth = mSelector->minWidth();
 #ifdef Q_WS_MAC
+    /* Remove all title bar buttons (Buggy Qt) */
+    ::darwinSetHidesAllTitleButtons (this);
+
     /* Set all size policies to ignored */
     for (int i = 0; i < mStack->count(); ++i)

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

@@ -30 +30 @@
 NativeWindowRef darwinToNativeWindowImpl (NativeViewRef aView)
 {
-    return reinterpret_cast<WindowRef> (::HIViewGetWindow (aView));
+    if (aView)
+        return reinterpret_cast<WindowRef> (::HIViewGetWindow (aView));
+    return NULL;
 }
 
 void darwinSetShowsToolbarButtonImpl (NativeWindowRef aWindow, bool aEnabled)
 {
-    int err = ::ChangeWindowAttributes (aWindow, aEnabled ? kWindowToolbarButtonAttribute:kWindowNoAttributes,
-                                                 aEnabled ? kWindowNoAttributes:kWindowToolbarButtonAttribute);
+    int err = ::ChangeWindowAttributes (aWindow, aEnabled ? kWindowToolbarButtonAttribute : kWindowNoAttributes,
+                                                 aEnabled ? kWindowNoAttributes : kWindowToolbarButtonAttribute);
+    AssertCarbonOSStatus (err);
+}
+
+void darwinSetShowsResizeIndicatorImpl (NativeWindowRef aWindow, bool aEnabled)
+{
+    int err = ::ChangeWindowAttributes (aWindow, aEnabled ? kWindowResizableAttribute : kWindowNoAttributes,
+                                                 aEnabled ? kWindowNoAttributes : kWindowResizableAttribute);
     AssertCarbonOSStatus (err);
 }
@@ -42 +51 @@
 void darwinSetMouseCoalescingEnabled (bool aEnabled)
 {
-    ::SetMouseCoalescingEnabled (aEnabled, NULL);
+    int err = ::SetMouseCoalescingEnabled (aEnabled, NULL);
+    AssertCarbonOSStatus (err);
 }
 
@@ -48 +58 @@
 {
     HIRect r = CGRectMake (x, y, width, height);
-    TransitionWindowWithOptions (aWidget, kWindowSlideTransitionEffect, kWindowResizeTransitionAction, &r, false, NULL);
-}
-
+    int err = ::TransitionWindowWithOptions (aWidget,
+                                             kWindowSlideTransitionEffect,
+                                             kWindowResizeTransitionAction,
+                                             &r,
+                                             false,
+                                             NULL);
+    AssertCarbonOSStatus (err);
+}
 
 

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

@@ -33 +33 @@
     if (aView)
         return [aView window];
-    return 0;
+    return NULL;
 }
 
@@ -39 +39 @@
 {
     [aWindow setShowsToolbarButton:aEnabled];
+}
+
+void darwinSetShowsResizeIndicatorImpl (NativeWindowRef aWindow, bool aEnabled)
+{
+    [aWindow setShowsResizeIndicator:aEnabled];
+}
+
+void darwinSetHidesAllTitleButtonsImpl (NativeWindowRef aWindow)
+{
+    NSButton *closeButton = [aWindow standardWindowButton:NSWindowCloseButton];
+    if (closeButton != Nil)
+        [closeButton setHidden:YES];
+    NSButton *minButton = [aWindow standardWindowButton:NSWindowMiniaturizeButton];
+    if (minButton != Nil)
+        [minButton setHidden:YES];
+    NSButton *zoomButton = [aWindow standardWindowButton:NSWindowZoomButton];
+    if (zoomButton != Nil)
+        [zoomButton setHidden:YES];
+    NSButton *iconButton = [aWindow standardWindowButton:NSWindowDocumentIconButton];
+    if (iconButton != Nil)
+        [iconButton setHidden:YES];
 }
 
@@ -68 +89 @@
     [aWindow setFrame:windowFrame display:YES animate:YES];
 }
+

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

@@ -41 +41 @@
 NativeWindowRef darwinToNativeWindow (QWidget *aWidget)
 {
-    return darwinToNativeWindowImpl (::darwinToNativeView (aWidget));
+    return ::darwinToNativeWindowImpl (::darwinToNativeView (aWidget));
 }
 
 NativeWindowRef darwinToNativeWindow (NativeViewRef aView)
 {
-    return darwinToNativeWindowImpl (aView);
+    return ::darwinToNativeWindowImpl (aView);
 }
 
@@ -53 +53 @@
     QWidget *parent = aToolBar->parentWidget();
     if (parent)
-        darwinSetShowsToolbarButtonImpl (::darwinToNativeWindow (parent), aEnabled);
+        ::darwinSetShowsToolbarButtonImpl (::darwinToNativeWindow (parent), aEnabled);
 }
 
 void darwinWindowAnimateResize (QWidget *aWidget, const QRect &aTarget)
 {
-    darwinWindowAnimateResizeImpl (::darwinToNativeWindow (aWidget), aTarget.x(), aTarget.y(), aTarget.width(), aTarget.height());
+    ::darwinWindowAnimateResizeImpl (::darwinToNativeWindow (aWidget), aTarget.x(), aTarget.y(), aTarget.width(), aTarget.height());
+}
+
+void darwinSetHidesAllTitleButtons (QWidget *aWidget)
+{
+#ifdef QT_MAC_USE_COCOA
+    /* Currently only necessary in the Cocoa version */
+    ::darwinSetHidesAllTitleButtonsImpl (::darwinToNativeWindow (aWidget));
+#else /* QT_MAC_USE_COCOA */
+    NOREF (aWidget);
+#endif /* !QT_MAC_USE_COCOA */
+}
+
+void darwinSetShowsResizeIndicator (QWidget *aWidget, bool aEnabled)
+{
+    ::darwinSetShowsResizeIndicatorImpl (::darwinToNativeWindow (aWidget), aEnabled);
 }