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

[Bán Róbert]

 vcl/source/control/imp_listbox.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 5d64ef270b22544a2dcbcaed191050b616d1f956
Author: Bán Róbert <robert.ban102 at gmail.com>
Date:   Tue Dec 26 01:49:25 2017 +0100

    tdf#111781 Drawing selection highlight twice in listBoxes
    
    The selection highlight is drawn tiwce: a rectangle and the
    background of the text. The fix removes the text backround
    by setting it to transparent.
    
    Change-Id: I969cb5b27619df07d0a37f1a38c859dbf2565483
    Reviewed-on: https://gerrit.libreoffice.org/47064
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/vcl/source/control/imp_listbox.cxx b/vcl/source/control/imp_listbox.cxx
index c9d4babe859b..279a1787babb 100644
--- a/vcl/source/control/imp_listbox.cxx
+++ b/vcl/source/control/imp_listbox.cxx
@@ -1699,7 +1699,6 @@ void ImplListBoxWindow::ImplPaint(vcl::RenderContext& rRenderContext, sal_Int32
     {
         rRenderContext.SetTextColor(!IsEnabled() ? rStyleSettings.GetDisableColor() : rStyleSettings.GetHighlightTextColor());
         rRenderContext.SetFillColor(rStyleSettings.GetHighlightColor());
-        rRenderContext.SetTextFillColor(rStyleSettings.GetHighlightColor());
         rRenderContext.DrawRect(aRect);
     }
     else
@@ -1707,8 +1706,8 @@ void ImplListBoxWindow::ImplPaint(vcl::RenderContext& rRenderContext, sal_Int32
         ApplySettings(rRenderContext);
         if (!IsEnabled())
             rRenderContext.SetTextColor(rStyleSettings.GetDisableColor());
-        rRenderContext.SetTextFillColor();
     }
+    rRenderContext.SetTextFillColor();
 
     if (IsUserDrawEnabled())
     {