Changeset 58140 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Oct 9, 2015 11:32:02 AM (9 years ago)

Author:

vboxsync

Message:

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

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) (2 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

@@ -182 +182 @@
     if (pButton != Nil)
         [pButton setHidden: YES];
-}
-
-void darwinDisableZoomButtonFullscreenCheckImpl(NativeNSWindowRef pWindow)
-{
-    NSButton *pButton = [pWindow standardWindowButton:NSWindowZoomButton];
-    if (pButton != Nil)
-    {
-        /* By default there is an internal selector "_setNeedsZoom:" used.
-         * Since El Capitan it checks if window is able to enter full-screen
-         * and enters full-screen even if we do not want it, so we are
-         * hacking selector to be "zoom:" instead: */
-        [pButton setAction: @selector(zoom:)];
-    }
 }
 

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

@@ -82 +82 @@
 {
     ::darwinSetHideTitleButtonImpl(::darwinToNativeWindow(pWidget), buttonType);
-}
-
-void darwinDisableZoomButtonFullscreenCheck(QWidget *pWidget)
-{
-    ::darwinDisableZoomButtonFullscreenCheckImpl(::darwinToNativeWindow(pWidget));
 }
 

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

@@ -71 +71 @@
 void darwinSetHidesAllTitleButtonsImpl(NativeNSWindowRef pWindow);
 void darwinSetHideTitleButtonImpl(NativeNSWindowRef pWindow, CocoaWindowButtonType buttonType);
-void darwinDisableZoomButtonFullscreenCheckImpl(NativeNSWindowRef pWindow);
 void darwinLabelWindow(NativeNSWindowRef pWindow, NativeNSImageRef pImage, bool fCenter);
 void darwinSetShowsWindowTransparentImpl(NativeNSWindowRef pWindow, bool fEnabled);
@@ -243 +242 @@
 void darwinSetHidesAllTitleButtons(QWidget *pWidget);
 void darwinSetHideTitleButton(QWidget *pWidget, CocoaWindowButtonType buttonType);
-void darwinDisableZoomButtonFullscreenCheck(QWidget *pWidget);
 void darwinSetShowsWindowTransparent(QWidget *pWidget, bool fEnabled);
 void darwinSetWindowHasShadow(QWidget *pWidget, bool fEnabled);

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

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

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

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