vcl/source/window/status.cxx |    5 -----
 vcl/win/window/salframe.cxx  |    1 +
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 5c723785d4cf512bba0591a5328f2a9784b82bc2
Author:     Heiko Tietze <[email protected]>
AuthorDate: Wed Jan 28 06:54:32 2026 +0100
Commit:     Heiko Tietze <[email protected]>
CommitDate: Wed Jan 28 12:15:24 2026 +0100

    Resolves tdf#170143 - Set ButtonTextColor on theme change
    
    Reverts c7a29af1d77c4e1483154b262c7c621067cd2685
    
    Change-Id: I50215c3e161d3e22ed34c7407c22cdae50fff045
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198250
    Reviewed-by: Heiko Tietze <[email protected]>
    Tested-by: Jenkins
    Tested-by: Heiko Tietze <[email protected]>

diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index df2642596925..f3dc44b4a193 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -413,11 +413,6 @@ void StatusBar::ImplDrawItem(vcl::RenderContext& 
rRenderContext, bool bOffScreen
 
         if (bOffScreen)
         {
-            if (ThemeColors::IsThemeEnabled())
-            {
-                const StyleSettings& rStyleSettings = 
rRenderContext.GetSettings().GetStyleSettings();
-                
mpImplData->mpVirDev->SetTextColor(rStyleSettings.GetWindowTextColor());
-            }
             mpImplData->mpVirDev->DrawText(
                         aTextPos,
                         pItem->maText,
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index b677efb95d21..603c57048544 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -2555,6 +2555,7 @@ static void lcl_LoadColorsFromTheme(StyleSettings& 
rStyleSet)
     rStyleSet.SetMenuBarTextColor(rThemeColors.GetMenuBarTextColor());
     rStyleSet.SetMenuTextColor(rThemeColors.GetMenuTextColor());
 
+    rStyleSet.SetButtonTextColor(rThemeColors.GetButtonTextColor());
     
rStyleSet.SetDefaultActionButtonTextColor(rThemeColors.GetButtonTextColor());
     rStyleSet.SetActionButtonTextColor(rThemeColors.GetButtonTextColor());
     rStyleSet.SetShadowColor(rThemeColors.GetShadeColor());

Reply via email to