diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-12-02 12:04:26 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-12-02 15:16:50 +0000 |
| commit | 1e222575a3b637398b5b2d8e3172f12538ff34e3 (patch) | |
| tree | f070658249f507af4d61a709842b13ef7f75b10f | |
| parent | 47d549c015d53b84b4f98c144c1b49378d027a4d (diff) | |
Related: tdf#152284 use a different macOS DarkShadow
Change-Id: Ibea0f567e4007eda007f8f606cd0bbe5b9c6d0df
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143573
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | vcl/osx/salframe.cxx | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx index c738ce1e6217..77ad16bd3f0d 100644 --- a/vcl/osx/salframe.cxx +++ b/vcl/osx/salframe.cxx @@ -1294,17 +1294,14 @@ SAL_WNODEPRECATED_DECLARATIONS_POP aInactiveTabColor.DecreaseLuminance( 32 ); aStyleSettings.SetInactiveTabColor( aInactiveTabColor ); - Color aShadowColor( aStyleSettings.GetShadowColor() ); - aShadowColor.IncreaseLuminance( 32 ); - - aShadowColor = getColor( [NSColor systemGrayColor ], - aShadowColor, mpNSWindow ); - + Color aShadowColor = getColor( [NSColor systemGrayColor ], + aStyleSettings.GetShadowColor(), mpNSWindow ); aStyleSettings.SetShadowColor( aShadowColor ); - Color aDarkShadowColor = getColor( [[NSColor systemGrayColor] shadowWithLevel: 0.5 ], - aStyleSettings.GetDarkShadowColor(), mpNSWindow ); - + // tdf#152284 for DarkMode brighten it, while darken for BrightMode + NSColor* pDarkColor = bUseDarkMode ? [[NSColor systemGrayColor] highlightWithLevel: 0.5] + : [[NSColor systemGrayColor] shadowWithLevel: 0.5]; + Color aDarkShadowColor = getColor( pDarkColor, aStyleSettings.GetDarkShadowColor(), mpNSWindow ); aStyleSettings.SetDarkShadowColor(aDarkShadowColor); // get the system font settings |