Changeset 80696 in vbox for trunk

Timestamp:

Sep 10, 2019 11:38:18 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9241: macOS: UIGraphicsScrollArea: Use underlying OS setting to acquire actual scroller mode.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• platform/darwin/VBoxUtils-darwin-cocoa.mm (modified) (2 diffs)
• platform/darwin/VBoxUtils-darwin.h (modified) (1 diff)
• widgets/graphics/UIGraphicsScrollArea.cpp (modified) (2 diffs)

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

@@ -27 +27 @@
 #import <AppKit/NSFont.h>
 #import <AppKit/NSScreen.h>
+#import <AppKit/NSScroller.h>
 #import <AppKit/NSWindow.h>
 #import <AppKit/NSImageView.h>
@@ -261 +262 @@
     if ([NSScreen respondsToSelector: @selector(screensHaveSeparateSpaces)])
         return [NSScreen performSelector: @selector(screensHaveSeparateSpaces)];
+    else
+        return false;
+}
+
+bool darwinIsScrollerStyleOverlay()
+{
+    /* Check whether scrollers by default have legacy style.
+     * This method is available since 10.7 only. */
+    if ([NSScroller respondsToSelector: @selector(preferredScrollerStyle)])
+    {
+        const int enmType = (int)(intptr_t)[NSScroller performSelector: @selector(preferredScrollerStyle)];
+        return enmType == NSScrollerStyleOverlay;
+    }
     else
         return false;

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

@@ -115 +115 @@
 SHARED_LIBRARY_STUFF bool darwinIsOnActiveSpace(NativeNSWindowRef pWindow);
 SHARED_LIBRARY_STUFF bool darwinScreensHaveSeparateSpaces();
+SHARED_LIBRARY_STUFF bool darwinIsScrollerStyleOverlay();
 
 bool darwinOpenFile(NativeNSStringRef pstrFile);

trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsScrollArea.cpp

@@ -23 +23 @@
 #include "UIGraphicsScrollArea.h"
 #include "UIGraphicsScrollBar.h"
+#ifdef VBOX_WS_MAC
+# include "VBoxUtils.h"
+#endif
 
 
@@ -245 +248 @@
 void UIGraphicsScrollArea::prepareWidgets()
 {
+#ifdef VBOX_WS_MAC
+    /* Check whether scroll-bar is in auto-hide (overlay) mode: */
+    m_fAutoHideMode = darwinIsScrollerStyleOverlay();
+#endif
+
     /* Create scroll-bar: */
     m_pScrollBar = new UIGraphicsScrollBar(m_enmOrientation, m_fAutoHideMode, this);