[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/rendercontext/drawmode.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit d6a5431b5ef369823e4438a34767bf6c234eb231
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Oct 12 10:21:13 2022 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Oct 12 17:02:58 2022 +0200

    use WindowTextColor as the fg for high contrast
    
    No platform sets TextColor away from its default of black and we're
    using WindowColor as the bg for high contrast, so we need to use
    something suitable for use on WindowColor. MSDN docs state
    COLOR_WINDOWTEXT for HighContrast if using COLOR_WINDOW.
    
    Change-Id: Icdd3cf6d76da7eb544f08619717689b44ab1fd38
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141247
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/source/rendercontext/drawmode.cxx 
b/vcl/source/rendercontext/drawmode.cxx
index b1b85d33f52f..fe0a1660acd5 100644
--- a/vcl/source/rendercontext/drawmode.cxx
+++ b/vcl/source/rendercontext/drawmode.cxx
@@ -53,7 +53,7 @@ Color GetLineColor(Color const& rColor, DrawModeFlags 
nDrawMode,
             }
             else if (nDrawMode & DrawModeFlags::SettingsLine)
             {
-                aColor = rStyleSettings.GetFontColor();
+                aColor = rStyleSettings.GetWindowTextColor();
             }
         }
     }
@@ -119,7 +119,7 @@ Color GetHatchColor(Color const& rColor, DrawModeFlags 
nDrawMode,
     }
     else if (nDrawMode & DrawModeFlags::SettingsLine)
     {
-        aColor = rStyleSettings.GetFontColor();
+        aColor = rStyleSettings.GetWindowTextColor();
     }
 
     return aColor;
@@ -149,7 +149,7 @@ Color GetTextColor(Color const& rColor, DrawModeFlags 
nDrawMode,
         }
         else if (nDrawMode & DrawModeFlags::SettingsText)
         {
-            aColor = rStyleSettings.GetFontColor();
+            aColor = rStyleSettings.GetWindowTextColor();
         }
     }
 
@@ -183,7 +183,7 @@ vcl::Font GetFont(vcl::Font const& rFont, DrawModeFlags 
nDrawMode,
         }
         else if (nDrawMode & DrawModeFlags::SettingsText)
         {
-            aTextColor = rStyleSettings.GetFontColor();
+            aTextColor = rStyleSettings.GetWindowTextColor();
         }
 
         aFont.SetColor(aTextColor);