1 files changed, 9 insertions, 5 deletions
diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm
index ae0029d415..168ff49d64 100644
--- a/src/plugins/styles/mac/qmacstyle_mac.mm
+++ b/src/plugins/styles/mac/qmacstyle_mac.mm
@@ -2589,10 +2589,13 @@ int QMacStyle::pixelMetric(PixelMetric metric, const QStyleOption *opt, const QW
     case PM_ToolBarFrameWidth:
         ret = 1;
         break;
-    case PM_ScrollView_ScrollBarOverlap:
-        ret = [NSScroller preferredScrollerStyle] == NSScrollerStyleOverlay ?
-               pixelMetric(PM_ScrollBarExtent, opt, widget) : 0;
+    case PM_ScrollView_ScrollBarOverlap: {
+        const QStyle *realStyle = widget ? widget->style() : proxy();
+        ret = realStyle->styleHint(SH_ScrollBar_Transient, opt, widget)
+            ? realStyle->pixelMetric(PM_ScrollBarExtent, opt, widget)
+            : 0;
         break;
+    }
     default:
         ret = QCommonStyle::pixelMetric(metric, opt, widget);
         break;
@@ -3320,7 +3323,7 @@ void QMacStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPai
         NSButtonCell *triangleCell = static_cast<NSButtonCell *>(d->cocoaCell(cw));
         [triangleCell setState:(opt->state & State_Open) ? NSControlStateValueOn : NSControlStateValueOff];
         bool viewHasFocus = (w && w->hasFocus()) || (opt->state & State_HasFocus);
-        [triangleCell setBackgroundStyle:((opt->state & State_Selected) && viewHasFocus) ? NSBackgroundStyleDark : NSBackgroundStyleLight];
+        [triangleCell setBackgroundStyle:((opt->state & State_Selected) && viewHasFocus) ? NSBackgroundStyleEmphasized : NSBackgroundStyleNormal];
 
         d->setupNSGraphicsContext(cg, NO);
 
@@ -5256,7 +5259,8 @@ void QMacStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComplex
             const auto cocoaSize = d->effectiveAquaSizeConstrain(opt, widget);
             const CGFloat maxExpandScale = expandedKnobWidths[cocoaSize] / knobWidths[cocoaSize];
 
-            const bool isTransient = proxy()->styleHint(SH_ScrollBar_Transient, opt, widget);
+            const QStyle *realStyle = widget ? widget->style() : proxy();
+            const bool isTransient = realStyle->styleHint(SH_ScrollBar_Transient, opt, widget);
             if (!isTransient)
                 d->stopAnimation(opt->styleObject);
             bool wasActive = false;