diff options
author | Caolán McNamara <caolanm@redhat.com> | 2022-09-19 17:26:15 +0100 |
---|---|---|
committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2022-09-19 23:58:57 +0200 |
commit | 286000f2df456cffabd678e3bde56af14c7bd185 (patch) | |
tree | 8ca81a3f4b483a034647735938cf2f2734e108c4 | |
parent | 3890b65ffa04c2cb9b4956ac65409d64b5c7f11c (diff) |
tdf#151052 set Windows darkmode "ToolTextColor" to same as "WindowTextColor"
they are the same in light mode, so do the same in darkmode
Change-Id: Ib0186383fcd7f8d74c7ada6826c6955a747e4ecd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140162
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
-rw-r--r-- | vcl/win/window/salframe.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx index 2ae47ec57630..db4da4e3e076 100644 --- a/vcl/win/window/salframe.cxx +++ b/vcl/win/window/salframe.cxx @@ -2667,6 +2667,7 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings ) aStyleSettings.SetWindowColor( ImplWinColorToSal( color ) ); GetThemeColor(hTheme, 0, 0, TMT_TEXTCOLOR, &color); aStyleSettings.SetWindowTextColor( ImplWinColorToSal( color ) ); + aStyleSettings.SetToolTextColor( ImplWinColorToSal( color ) ); CloseThemeData(hTheme); hTheme = OpenThemeData(mhWnd, L"Button"); @@ -2694,6 +2695,7 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings ) aStyleSettings.SetFaceColor( ImplWinColorToSal( GetSysColor( COLOR_3DFACE ) ) ); aStyleSettings.SetWindowColor( ImplWinColorToSal( GetSysColor( COLOR_WINDOW ) ) ); aStyleSettings.SetWindowTextColor( ImplWinColorToSal( GetSysColor( COLOR_WINDOWTEXT ) ) ); + aStyleSettings.SetToolTextColor( ImplWinColorToSal( GetSysColor( COLOR_WINDOWTEXT ) ) ); aControlTextColor = ImplWinColorToSal(GetSysColor(COLOR_BTNTEXT)); aStyleSettings.SetRadioCheckTextColor( ImplWinColorToSal( GetSysColor( COLOR_WINDOWTEXT ) ) ); aStyleSettings.SetMenuTextColor( ImplWinColorToSal( GetSysColor( COLOR_MENUTEXT ) ) ); @@ -2744,7 +2746,6 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings ) aStyleSettings.SetGroupTextColor( aStyleSettings.GetRadioCheckTextColor() ); aStyleSettings.SetLabelTextColor( aStyleSettings.GetRadioCheckTextColor() ); aStyleSettings.SetActiveTabColor( aStyleSettings.GetWindowColor() ); - aStyleSettings.SetToolTextColor( ImplWinColorToSal( GetSysColor( COLOR_WINDOWTEXT ) ) ); aStyleSettings.SetFieldColor( aStyleSettings.GetWindowColor() ); aStyleSettings.SetFieldTextColor( aStyleSettings.GetWindowTextColor() ); aStyleSettings.SetFieldRolloverTextColor( aStyleSettings.GetFieldTextColor() ); |