svtools/source/control/ctrlbox.cxx |    2 +-
 svx/source/tbxctrls/tbcontrl.cxx   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ed057e68d5289d0fbba66eebeea98e8f31363fbd
Author:     Heiko Tietze <[email protected]>
AuthorDate: Tue Feb 10 10:55:37 2026 +0100
Commit:     Heiko Tietze <[email protected]>
CommitDate: Tue Feb 17 08:33:53 2026 +0100

    Related tdf#170143 - Inconsistent theme colors on non-native controls
    
    Fixes different colors on the FontStyleBox and FontNameBox on Windows,
    namely showing WindowTextColor in the collapsed state and (before this
    patch) DialogTextColor for the expanded list
    
    Change-Id: Ic26dcad186d6680c940cef1e81d3b74e65c3fcf1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199042
    Reviewed-by: Heiko Tietze <[email protected]>
    Tested-by: Jenkins
    (cherry picked from commit 75e20cc06017dfcca05dda13fa95dedfaab2af8c)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199495
    Reviewed-by: Mihai Vasiliu <[email protected]>

diff --git a/svtools/source/control/ctrlbox.cxx 
b/svtools/source/control/ctrlbox.cxx
index 9add7d883b7d..75fd11c7347a 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -612,7 +612,7 @@ static void DrawPreview(const FontMetric& rFontMetric, 
const Point& rTopLeft, Ou
     if (bSelected)
         rDevice.SetTextColor(rStyleSettings.GetHighlightTextColor());
     else
-        rDevice.SetTextColor(rStyleSettings.GetDialogTextColor());
+        rDevice.SetTextColor(rStyleSettings.GetWindowTextColor());
 
     tools::Long nX = rTopLeft.X();
     tools::Long nH = gUserItemSz.Height();
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 4f95332a86c4..624e45913724 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1364,7 +1364,7 @@ void SvxStyleBox_Base::SetupEntry(vcl::RenderContext& 
rRenderContext, sal_Int32
     if (!bIsNotSelected)
         rRenderContext.SetTextColor(rStyleSettings.GetHighlightTextColor());
     else
-        rRenderContext.SetTextColor(rStyleSettings.GetDialogTextColor());
+        rRenderContext.SetTextColor(rStyleSettings.GetWindowTextColor());
 
     // handle the push-button
     if (!bIsNotSelected)

Reply via email to