diff options
| author | Rafael Lima <rafael.palma.lima@gmail.com> | 2022-09-30 19:05:10 +0200 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2022-10-05 05:43:42 +0200 |
| commit | 3e4697c7675430f5e4e2221c951971caee0bdeb8 (patch) | |
| tree | e7047fc5339fd69fa53ca984995c0b1db7ae8e63 /svx | |
| parent | cc038c471e96d766db404388b140364614898bf2 (diff) | |
tdf#151232 Fix lines in Special Characters dialog in dark mode
This patch makes the lines in the Special Characters dialog visible in dark mode. The Insert Symbols widget is also fixed with this patch.
Tested in gen, gtk3 and kf5.
Change-Id: Id1ee21557f2a0ea4ad8b60973d3de71e4d6d5d09
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140759
Tested-by: Jenkins
Reviewed-by: V, Stuart Foote <vstuart.foote@utsa.edu>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/charmap.cxx | 16 | ||||
| -rw-r--r-- | svx/source/dialog/searchcharmap.cxx | 16 |
2 files changed, 18 insertions, 14 deletions
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index a48d26b67954..b268fff518d1 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -510,7 +510,16 @@ void SvxShowCharSet::DrawChars_Impl(vcl::RenderContext& rRenderContext, int n1, Size aOutputSize(GetOutputSizePixel()); + const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); + const Color aWindowTextColor(rStyleSettings.GetFieldTextColor()); + Color aHighlightColor(rStyleSettings.GetHighlightColor()); + Color aHighlightTextColor(rStyleSettings.GetHighlightTextColor()); + Color aFaceColor(rStyleSettings.GetFaceColor()); + Color aLightColor(rStyleSettings.GetLightColor()); + Color aShadowColor(rStyleSettings.GetShadowColor()); + int i; + rRenderContext.SetLineColor(aShadowColor); for (i = 1; i < COLUMN_COUNT; ++i) { rRenderContext.DrawLine(Point(nX * i + m_nXGap, 0), @@ -521,13 +530,6 @@ void SvxShowCharSet::DrawChars_Impl(vcl::RenderContext& rRenderContext, int n1, rRenderContext.DrawLine(Point(0, nY * i + m_nYGap), Point(aOutputSize.Width(), nY * i + m_nYGap)); } - const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); - const Color aWindowTextColor(rStyleSettings.GetFieldTextColor()); - Color aHighlightColor(rStyleSettings.GetHighlightColor()); - Color aHighlightTextColor(rStyleSettings.GetHighlightTextColor()); - Color aFaceColor(rStyleSettings.GetFaceColor()); - Color aLightColor(rStyleSettings.GetLightColor()); - Color aShadowColor(rStyleSettings.GetShadowColor()); int nTextHeight = rRenderContext.GetTextHeight(); tools::Rectangle aBoundRect; diff --git a/svx/source/dialog/searchcharmap.cxx b/svx/source/dialog/searchcharmap.cxx index 201e018d5652..034ebd317a5a 100644 --- a/svx/source/dialog/searchcharmap.cxx +++ b/svx/source/dialog/searchcharmap.cxx @@ -157,7 +157,16 @@ void SvxSearchCharSet::DrawChars_Impl(vcl::RenderContext& rRenderContext, int n1 Size aOutputSize(GetOutputSizePixel()); + const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); + const Color aWindowTextColor(rStyleSettings.GetFieldTextColor()); + Color aHighlightColor(rStyleSettings.GetHighlightColor()); + Color aHighlightTextColor(rStyleSettings.GetHighlightTextColor()); + Color aFaceColor(rStyleSettings.GetFaceColor()); + Color aLightColor(rStyleSettings.GetLightColor()); + Color aShadowColor(rStyleSettings.GetShadowColor()); + int i; + rRenderContext.SetLineColor(aShadowColor); for (i = 1; i < COLUMN_COUNT; ++i) { rRenderContext.DrawLine(Point(nX * i + m_nXGap, 0), @@ -168,13 +177,6 @@ void SvxSearchCharSet::DrawChars_Impl(vcl::RenderContext& rRenderContext, int n1 rRenderContext.DrawLine(Point(0, nY * i + m_nYGap), Point(aOutputSize.Width(), nY * i + m_nYGap)); } - const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); - const Color aWindowTextColor(rStyleSettings.GetFieldTextColor()); - Color aHighlightColor(rStyleSettings.GetHighlightColor()); - Color aHighlightTextColor(rStyleSettings.GetHighlightTextColor()); - Color aFaceColor(rStyleSettings.GetFaceColor()); - Color aLightColor(rStyleSettings.GetLightColor()); - Color aShadowColor(rStyleSettings.GetShadowColor()); int nTextHeight = rRenderContext.GetTextHeight(); tools::Rectangle aBoundRect; |