summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoonchild <mcwerewolf@wolfbeast.com>2019-04-16 14:17:09 +0200
committerGitHub <noreply@github.com>2019-04-16 14:17:09 +0200
commit07381c3edad8ec24b5d820ec0592e0cafa7d73fa (patch)
tree6a77d9ae3da25d2e22a0ec0cd0524d459c488e37
parent095ea556855b38138e39e713f482eb440f7da9b2 (diff)
parent577ca2cd6040a7b4406331cdafa89778de871c20 (diff)
downloadUXP-07381c3edad8ec24b5d820ec0592e0cafa7d73fa.tar
UXP-07381c3edad8ec24b5d820ec0592e0cafa7d73fa.tar.gz
UXP-07381c3edad8ec24b5d820ec0592e0cafa7d73fa.tar.lz
UXP-07381c3edad8ec24b5d820ec0592e0cafa7d73fa.tar.xz
UXP-07381c3edad8ec24b5d820ec0592e0cafa7d73fa.zip
Merge pull request #1042 from wicknix/master
Bug 1408701: Ensure that we continue to show dark scrollbar thumbs on…
-rw-r--r--widget/cocoa/nsNativeThemeCocoa.mm3
1 files changed, 2 insertions, 1 deletions
diff --git a/widget/cocoa/nsNativeThemeCocoa.mm b/widget/cocoa/nsNativeThemeCocoa.mm
index 3c8695442..597c25a48 100644
--- a/widget/cocoa/nsNativeThemeCocoa.mm
+++ b/widget/cocoa/nsNativeThemeCocoa.mm
@@ -2778,7 +2778,8 @@ nsNativeThemeCocoa::DrawWidgetBackground(nsRenderingContext* aContext,
NSMutableDictionary* options = [NSMutableDictionary dictionaryWithObjectsAndKeys:
(isOverlay ? @"kCUIWidgetOverlayScrollBar" : @"scrollbar"), @"widget",
(isSmall ? @"small" : @"regular"), @"size",
- (isHorizontal ? @"kCUIOrientHorizontal" : @"kCUIOrientVertical"), @"kCUIOrientationKey",
+ (isOverlay && isOnTopOfDarkBackground ? @"kCUIVariantWhite" : @""),
+ @"kCUIVariantKey",
(isOnTopOfDarkBackground ? @"kCUIVariantWhite" : @""), @"kCUIVariantKey",
[NSNumber numberWithBool:YES], @"indiconly",
[NSNumber numberWithBool:YES], @"kCUIThumbProportionKey",