diff options
author | Moonchild <mcwerewolf@wolfbeast.com> | 2019-04-16 14:17:09 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-16 14:17:09 +0200 |
commit | 07381c3edad8ec24b5d820ec0592e0cafa7d73fa (patch) | |
tree | 6a77d9ae3da25d2e22a0ec0cd0524d459c488e37 | |
parent | 095ea556855b38138e39e713f482eb440f7da9b2 (diff) | |
parent | 577ca2cd6040a7b4406331cdafa89778de871c20 (diff) | |
download | UXP-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.mm | 3 |
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", |