diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-12-02 12:26:42 +0000 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2022-12-02 15:51:55 +0000 |
| commit | 8d66d1f270b1f3fdb76d749fa92189d669ea436d (patch) | |
| tree | ff24462a7d63718385319c78ce2551a0ce6fd9d5 /vcl | |
| parent | f9395a123e8c85134bdd6e471bc93b2745e22a9d (diff) | |
Resolves: tdf#152284 pull Shadow and DarkShadow from theme
Change-Id: Idd5031aa2744d5b04f9f656fcab9fe6f21e2ddcb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143594
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/win/window/salframe.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx index ad54e4f20dbb..60df85ba814e 100644 --- a/vcl/win/window/salframe.cxx +++ b/vcl/win/window/salframe.cxx @@ -2655,6 +2655,10 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings ) GetThemeColor(hTheme, 0, 0, TMT_TEXTCOLOR, &color); aStyleSettings.SetWindowTextColor( ImplWinColorToSal( color ) ); aStyleSettings.SetToolTextColor( ImplWinColorToSal( color ) ); + GetThemeColor(hTheme, 0, 0, TMT_SHADOWCOLOR, &color); + aStyleSettings.SetShadowColor( ImplWinColorToSal( color ) ); + GetThemeColor(hTheme, 0, 0, TMT_DKSHADOW3D, &color); + aStyleSettings.SetDarkShadowColor( ImplWinColorToSal( color ) ); CloseThemeData(hTheme); hTheme = OpenThemeData(mhWnd, L"Button"); @@ -2683,6 +2687,8 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings ) aStyleSettings.SetWindowColor( ImplWinColorToSal( GetSysColor( COLOR_WINDOW ) ) ); aStyleSettings.SetWindowTextColor( ImplWinColorToSal( GetSysColor( COLOR_WINDOWTEXT ) ) ); aStyleSettings.SetToolTextColor( ImplWinColorToSal( GetSysColor( COLOR_WINDOWTEXT ) ) ); + aStyleSettings.SetShadowColor( ImplWinColorToSal( GetSysColor( COLOR_3DSHADOW ) ) ); + aStyleSettings.SetDarkShadowColor( ImplWinColorToSal( GetSysColor( COLOR_3DDKSHADOW ) ) ); aControlTextColor = ImplWinColorToSal(GetSysColor(COLOR_BTNTEXT)); aStyleSettings.SetRadioCheckTextColor( ImplWinColorToSal( GetSysColor( COLOR_WINDOWTEXT ) ) ); aStyleSettings.SetMenuTextColor( ImplWinColorToSal( GetSysColor( COLOR_MENUTEXT ) ) ); @@ -2702,8 +2708,6 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings ) aStyleSettings.SetInactiveTabColor( aStyleSettings.GetFaceColor() ); aStyleSettings.SetLightColor( ImplWinColorToSal( GetSysColor( COLOR_3DHILIGHT ) ) ); aStyleSettings.SetLightBorderColor( ImplWinColorToSal( GetSysColor( COLOR_3DLIGHT ) ) ); - aStyleSettings.SetShadowColor( ImplWinColorToSal( GetSysColor( COLOR_3DSHADOW ) ) ); - aStyleSettings.SetDarkShadowColor( ImplWinColorToSal( GetSysColor( COLOR_3DDKSHADOW ) ) ); aStyleSettings.SetHelpColor( ImplWinColorToSal( GetSysColor( COLOR_INFOBK ) ) ); aStyleSettings.SetHelpTextColor( ImplWinColorToSal( GetSysColor( COLOR_INFOTEXT ) ) ); |