summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2018-08-24 11:42:02 +0200
committerJan-Marek Glogowski <glogow@fbihome.de>2018-08-24 13:38:05 +0200
commit7a14326fea2cc317b8be57d45be7ca57aebd8bdd (patch)
treec4d2b21309afa6a4f98e74d8e374abf356edd33f
parent38d82e5724080a7799de430dc9ddaeb3c647bc05 (diff)
Just set highlight color for focus rect list box
Hopefully fixes the regression from commit 9897fd1c4715 ("Fix list box focused text color"), so it won't re-introduce tdf#109353. Change-Id: I7107deb33b959a250da9051b527099d723914223 Reviewed-on: https://gerrit.libreoffice.org/59549 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
-rw-r--r--vcl/source/control/imp_listbox.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/vcl/source/control/imp_listbox.cxx b/vcl/source/control/imp_listbox.cxx
index 67d40ca6267d..0655b74c6d8e 100644
--- a/vcl/source/control/imp_listbox.cxx
+++ b/vcl/source/control/imp_listbox.cxx
@@ -2684,13 +2684,16 @@ void ImplWin::ImplDraw(vcl::RenderContext& rRenderContext, bool bLayout)
if (bHasFocus && !ImplGetSVData()->maNWFData.mbDDListBoxNoTextArea)
{
if ( !ImplGetSVData()->maNWFData.mbNoFocusRects )
+ {
rRenderContext.SetFillColor( rStyleSettings.GetHighlightColor() );
+ rRenderContext.SetTextColor( rStyleSettings.GetHighlightTextColor() );
+ }
else
{
rRenderContext.SetLineColor();
rRenderContext.SetFillColor();
+ rRenderContext.SetTextColor( rStyleSettings.GetFieldTextColor() );
}
- rRenderContext.SetTextColor( rStyleSettings.GetHighlightTextColor() );
rRenderContext.DrawRect( maFocusRect );
}
else