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

[Libreoffice Gerrit user]

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

New commits:
commit 9897fd1c4715e7dbbe99fae2b82c2eda1d2b6f7e
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Thu Aug 23 10:12:45 2018 +0200
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Fri Aug 24 08:02:54 2018 +0200

    Fix list box focused text color
    
    This ignores the rollover state for text colors if the list box
    has the focus and just uses the highlight text color.
    
    This is visible in the "gen" VCL plugin and on Windows, e.g.
    when the focus is in the Math symbol list box.
    
    Change-Id: I00602e2a2601060f8588e474380dfa9af64a9094
    Reviewed-on: https://gerrit.libreoffice.org/59488
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>

diff --git a/vcl/source/control/imp_listbox.cxx b/vcl/source/control/imp_listbox.cxx
index 46418d2a1b22..67d40ca6267d 100644
--- a/vcl/source/control/imp_listbox.cxx
+++ b/vcl/source/control/imp_listbox.cxx
@@ -2690,12 +2690,7 @@ void ImplWin::ImplDraw(vcl::RenderContext& rRenderContext, bool bLayout)
                     rRenderContext.SetLineColor();
                     rRenderContext.SetFillColor();
                 }
-                Color aColor;
-                if( bNativeOK && (nState & ControlState::ROLLOVER) )
-                    aColor = rStyleSettings.GetFieldRolloverTextColor();
-                else
-                    aColor = rStyleSettings.GetFieldTextColor();
-                rRenderContext.SetTextColor( aColor );
+                rRenderContext.SetTextColor( rStyleSettings.GetHighlightTextColor() );
                 rRenderContext.DrawRect( maFocusRect );
             }
             else