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

[Akshay Deep]

 cui/source/dialogs/cuicharmap.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 8d74698f407de0b02826777d5cb3f5aca2fd50f1
Author: Akshay Deep <akshaydeepiitr at gmail.com>
Date:   Thu Aug 24 20:47:43 2017 +0000

    tdf#111795 - Special character preview control background color
    
    Change-Id: Id5c3448b0cf82e5ed3aa9afabc5bfb093eddf2e9
    Reviewed-on: https://gerrit.libreoffice.org/41524
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Heiko Tietze <tietze.heiko at googlemail.com>

diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 0e7f66c93f4b..72d81f410f3f 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -1139,10 +1139,13 @@ void SvxShowText::Paint(vcl::RenderContext& rRenderContext, const ::tools::Recta
     rRenderContext.SetFont(maFont);
 
     Color aTextCol = rRenderContext.GetTextColor();
+    Color aFillCol = rRenderContext.GetFillColor();
 
     const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
     const Color aWindowTextColor(rStyleSettings.GetDialogTextColor());
+    const Color aWindowColor(rStyleSettings.GetWindowColor());
     rRenderContext.SetTextColor(aWindowTextColor);
+    rRenderContext.SetFillColor(aWindowColor);
 
     const OUString aText = GetText();
     const Size aSize(GetOutputSizePixel());
@@ -1211,8 +1214,10 @@ void SvxShowText::Paint(vcl::RenderContext& rRenderContext, const ::tools::Recta
         }
     }
 
+    rRenderContext.DrawRect(tools::Rectangle(Point(0, 0), Size(GetOutputSizePixel().Width(), GetOutputSizePixel().Height())));
     rRenderContext.DrawText(aPoint, aText);
     rRenderContext.SetTextColor(aTextCol);
+    rRenderContext.SetFillColor(aFillCol);
     if (bShrankFont)
         rRenderContext.SetFont(aOrigFont);
 }