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

[Akshay Deep]

 sfx2/source/control/charwin.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit f42200a08a733ad592a5587043b052882e17fc45
Author: Akshay Deep <akshaydeepiitr at gmail.com>
Date:   Tue Aug 8 17:08:55 2017 +0530

    tdf#109210 - Non-standard background color at the new controls
    
    Change-Id: I381626d80470db18044d517c2c8bb76b2bc6a829
    Reviewed-on: https://gerrit.libreoffice.org/40879
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Akshay Deep <akshaydeepiitr at gmail.com>

diff --git a/sfx2/source/control/charwin.cxx b/sfx2/source/control/charwin.cxx
index 8ee19a02ab6d..f827ddae02b4 100644
--- a/sfx2/source/control/charwin.cxx
+++ b/sfx2/source/control/charwin.cxx
@@ -130,7 +130,8 @@ void SvxCharView::Paint(vcl::RenderContext& rRenderContext, const ::tools::Recta
     const Color aWindowTextColor(rStyleSettings.GetFieldTextColor());
     Color aHighlightColor(rStyleSettings.GetHighlightColor());
     Color aHighlightTextColor(rStyleSettings.GetHighlightTextColor());
-    Color aLightColor(rStyleSettings.GetLightColor());
+    Color aFillColor(rStyleSettings.GetWindowColor());
+    Color aTextColor(rStyleSettings.GetWindowTextColor());
 
     const OUString aText = GetText();
     const Size aSize(GetOutputSizePixel());
@@ -195,12 +196,14 @@ void SvxCharView::Paint(vcl::RenderContext& rRenderContext, const ::tools::Recta
     }
     else
     {
-        rRenderContext.SetFillColor(aLightColor);
+        rRenderContext.SetFillColor(aFillColor);
         rRenderContext.DrawRect(tools::Rectangle(Point(0, 0), Size(GetOutputSizePixel().Width(), GetOutputSizePixel().Height())));
 
         rRenderContext.SetTextColor(aWindowTextColor);
         rRenderContext.DrawText(aPoint, aText);
     }
+    rRenderContext.SetFillColor(aFillColor);
+    rRenderContext.SetTextColor(aTextColor);
 
     if (bShrankFont)
         rRenderContext.SetFont(aOrigFont);