Changeset 58141 in vbox

Timestamp:

Oct 9, 2015 11:34:50 AM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Revert r102971 workaround before the actual fix.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin-cocoa.mm

-              r58140
+              r58141
             [pButton setEnabled: NO];
+    }
+}
-void darwinSetHideTitleButtonImpl(NativeNSWindowRef pWindow, CocoaWindowButtonType buttonType)
+{
-    NSButton *pButton = Nil;
-    switch (buttonType)
+    {
-        case CocoaWindowButtonType_Close:            pButton = [pWindow standardWindowButton:NSWindowCloseButton]; break;
-        case CocoaWindowButtonType_Miniaturize:      pButton = [pWindow standardWindowButton:NSWindowMiniaturizeButton]; break;
-        case CocoaWindowButtonType_Zoom:             pButton = [pWindow standardWindowButton:NSWindowZoomButton]; break;
-        case CocoaWindowButtonType_Toolbar:          pButton = [pWindow standardWindowButton:NSWindowToolbarButton]; break;
-        case CocoaWindowButtonType_DocumentIcon:     pButton = [pWindow standardWindowButton:NSWindowDocumentIconButton]; break;
-        case CocoaWindowButtonType_DocumentVersions: /*pButton = [pWindow standardWindowButton:NSWindowDocumentVersionsButton];*/ break;
-        case CocoaWindowButtonType_FullScreen:       /*pButton = [pWindow standardWindowButton:NSWindowFullScreenButton];*/ break;
+    }
-    if (pButton != Nil)
-        [pButton setHidden: YES];
+}

-              r58140
+              r58141
     NOREF(pWidget);
 #endif /* !QT_MAC_USE_COCOA */
+}
-void darwinSetHideTitleButton(QWidget *pWidget, CocoaWindowButtonType buttonType)
+{
-    ::darwinSetHideTitleButtonImpl(::darwinToNativeWindow(pWidget), buttonType);
+}

-              r58140
+              r58141
 class QWidget;
-/** Cocoa window button types. */
-enum CocoaWindowButtonType
+{
-    CocoaWindowButtonType_Close,            // Since OS X 10.2
-    CocoaWindowButtonType_Miniaturize,      // Since OS X 10.2
-    CocoaWindowButtonType_Zoom,             // Since OS X 10.2
-    CocoaWindowButtonType_Toolbar,          // Since OS X 10.2
-    CocoaWindowButtonType_DocumentIcon,     // Since OS X 10.2
-    CocoaWindowButtonType_DocumentVersions, // Since OS X 10.7
-    CocoaWindowButtonType_FullScreen        // Since OS X 10.7
-};
 RT_C_DECLS_BEGIN
 …
 void darwinSetShowsResizeIndicatorImpl(NativeNSWindowRef pWindow, bool fEnabled);
 void darwinSetHidesAllTitleButtonsImpl(NativeNSWindowRef pWindow);
-void darwinSetHideTitleButtonImpl(NativeNSWindowRef pWindow, CocoaWindowButtonType buttonType);
 void darwinLabelWindow(NativeNSWindowRef pWindow, NativeNSImageRef pImage, bool fCenter);
 void darwinSetShowsWindowTransparentImpl(NativeNSWindowRef pWindow, bool fEnabled);
 …
 void darwinSetShowsResizeIndicator(QWidget *pWidget, bool fEnabled);
 void darwinSetHidesAllTitleButtons(QWidget *pWidget);
-void darwinSetHideTitleButton(QWidget *pWidget, CocoaWindowButtonType buttonType);
 void darwinSetShowsWindowTransparent(QWidget *pWidget, bool fEnabled);
 void darwinSetWindowHasShadow(QWidget *pWidget, bool fEnabled);

r58140	r58141
304	304	::darwinLabelWindow(this, &betaLabel, true);
305	305	}
306
307		~~/* No 'Zoom' button since El Capitan for now: */~~
308		~~if (vboxGlobal().osRelease() >= MacOSXRelease_ElCapitan)~~
309		~~darwinSetHideTitleButton(this, CocoaWindowButtonType_Zoom);~~
310	306	#endif /* Q_WS_MAC */
311	307	}

r58140	r58141
70	70	::darwinLabelWindow(this, &betaLabel, true);
71	71	}
72
73		~~/* No 'Zoom' button since El Capitan for now: */~~
74		~~if (vboxGlobal().osRelease() >= MacOSXRelease_ElCapitan)~~
75		~~darwinSetHideTitleButton(this, CocoaWindowButtonType_Zoom);~~
76	72	}
77	73	#endif /* Q_WS_MAC */

Note: See TracChangeset for help on using the changeset viewer.