summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2019-04-16 21:00:55 -0400
committerMatt A. Tobin <email@mattatobin.com>2019-04-16 21:00:55 -0400
commitdf0c78a8cbaf02fcd9fcd95a3eeb4cb68464300a (patch)
treee7850acdf623b066aebaa5f8772a62c85b572496
parent868c9b8d7f6771b7540ace735229f02f8cc46aaf (diff)
parent07381c3edad8ec24b5d820ec0592e0cafa7d73fa (diff)
downloadUXP-df0c78a8cbaf02fcd9fcd95a3eeb4cb68464300a.tar
UXP-df0c78a8cbaf02fcd9fcd95a3eeb4cb68464300a.tar.gz
UXP-df0c78a8cbaf02fcd9fcd95a3eeb4cb68464300a.tar.lz
UXP-df0c78a8cbaf02fcd9fcd95a3eeb4cb68464300a.tar.xz
UXP-df0c78a8cbaf02fcd9fcd95a3eeb4cb68464300a.zip
Merge branch 'master' into Sync-weave
-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",