Changeset 57973 in vbox

Timestamp:

Sep 30, 2015 4:54:45 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Mac OS X: Hide Zoom botton for normal/scale-mode VM windows.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• platform/darwin/VBoxUtils-darwin-cocoa.mm (modified) (1 diff)
• platform/darwin/VBoxUtils-darwin.cpp (modified) (1 diff)
• platform/darwin/VBoxUtils-darwin.h (modified) (3 diffs)
• runtime/normal/UIMachineWindowNormal.cpp (modified) (1 diff)
• runtime/scale/UIMachineWindowScale.cpp (modified) (1 diff)

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

@@ -165 +165 @@
             [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];
 }
 

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

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

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

@@ -38 +38 @@
 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
 
@@ -58 +70 @@
 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);
@@ -228 +241 @@
 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);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

@@ -304 +304 @@
         ::darwinLabelWindow(this, &betaLabel, true);
     }
+
+    /* No 'Zoom' button since El Capitan for now: */
+    if (vboxGlobal().osRelease() >= MacOSXRelease_ElCapitan)
+        darwinSetHideTitleButton(this, CocoaWindowButtonType_Zoom);
 #endif /* Q_WS_MAC */
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.cpp

@@ -70 +70 @@
         ::darwinLabelWindow(this, &betaLabel, true);
     }
+
+    /* No 'Zoom' button since El Capitan for now: */
+    if (vboxGlobal().osRelease() >= MacOSXRelease_ElCapitan)
+        darwinSetHideTitleButton(this, CocoaWindowButtonType_Zoom);
 }
 #endif /* Q_WS_MAC */