[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - cui/source

[Michael Weghorn (via logerrit)]

 cui/source/tabpages/tabstpge.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 67e5d8ff8d9bf029ab7480fa1f907696ca8ee2e9
Author:     Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Sep 15 19:03:12 2022 +0200
Commit:     Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Sat Sep 17 10:36:21 2022 +0200

    tdf#136928 Use dialog text color for signs in "Tabs" dialog
    
    and use an explicit matching background of dialog color
    
    Since the font color is black even in dark themes
    like "Adwaita-Dark", using a dark style/theme would previously
    result in black signs on a dark background for the Qt-based VCL
    plugins (qt5/kf5/qt6).
    
    Change-Id: I470011c26861221310e898c8f63fceef5e1aca3c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140029
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
    (cherry picked from commit 2deabc28166af2fc84e74f705b503a42e5394d54)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139982
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 5a468f1dfffa..b3a1745c26f9 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -52,7 +52,11 @@ void TabWin_Impl::Paint(vcl::RenderContext& rRenderContext, 
const ::tools::Recta
     Size aSize(GetOutputSizePixel());
     aPoint.setX( aSize.Width() / 2 );
     aPoint.setY( aSize.Height() / 2 );
-    Ruler::DrawTab(rRenderContext, 
rRenderContext.GetSettings().GetStyleSettings().GetFontColor(), aPoint, 
nTabStyle);
+    const StyleSettings& rStyleSettings = 
Application::GetSettings().GetStyleSettings();
+    rRenderContext.SetLineColor(rStyleSettings.GetShadowColor());
+    rRenderContext.SetFillColor(rStyleSettings.GetDialogColor());
+    rRenderContext.DrawRect(tools::Rectangle(Point(0,0), 
rRenderContext.GetOutputSize()));
+    Ruler::DrawTab(rRenderContext, rStyleSettings.GetDialogTextColor(), 
aPoint, nTabStyle);
 }
 
 SvxTabulatorTabPage::SvxTabulatorTabPage(weld::Container* pPage, 
weld::DialogController* pController, const SfxItemSet& rAttr)