commit 2f1ad908310918d964b2996ccf4e987b7b0af86f
author Caolán McNamara <caolanm@redhat.com> Mon Sep 19 17:26:15 2022 +0100
committer Caolán McNamara <caolanm@redhat.com> Mon Sep 19 22:25:54 2022 +0200
tree e3365952f45df6d8a5bffd7f668a67440d2e85dc
parent 8cc530b1ecbb706e998177ab6e85f33ac111b389

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/+/140195
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

vcl/win/window/salframe.cxx

diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index 1d8d372..9880613 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -2640,6 +2640,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");
@@ -2667,6 +2668,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 ) ) );
@@ -2717,7 +2719,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.SetListBoxWindowBackgroundColor( aStyleSettings.GetWindowColor() );
    aStyleSettings.SetFieldTextColor( aStyleSettings.GetWindowTextColor() );