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

[László Németh]

 vcl/source/window/menu.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 9085cb9aa97ce5a198e321a1c6303ac64bd735f0
Author: László Németh <laszlo.nemeth at collabora.com>
Date:   Tue Jun 9 14:44:57 2015 +0200

    tdf#91462 - fix invisible menu titles of open menus
    
    Change-Id: I6c9346917b813c662307999fe1c19a6c0665a656

diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 34c485d..703c7a1 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1843,7 +1843,12 @@ void Menu::ImplPaint(vcl::RenderContext& rRenderContext,
                     if (bRollover)
                         rRenderContext.SetTextColor(rSettings.GetMenuBarRolloverTextColor());
                     else if (bHighlighted)
-                        rRenderContext.SetTextColor(rSettings.GetMenuBarHighlightTextColor());
+                    {
+                        if ( rSettings.GetMenuHighlightColor().AsRGBHexString() != rSettings.GetMenuBarHighlightTextColor().AsRGBHexString() )
+                            rRenderContext.SetTextColor(rSettings.GetMenuBarHighlightTextColor());
+                        else
+                            rRenderContext.SetTextColor(rSettings.GetMenuBarRolloverTextColor());
+                    }
                 }
                 else
                 {