vcl/source/window/menu.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 13d08f07b4d67afe211997ca37934c45208d50a6
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jul 7 15:08:05 2015 +0100
Resolves: tdf#92539 reversed logic on enable/disable
Change-Id: I26ef918c0a68a84c22da3979c1180a2aee7a8109
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 8f2a93f..4e2345a 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1892,7 +1892,7 @@ void Menu::ImplPaint(vcl::RenderContext& rRenderContext,
if
(rRenderContext.IsNativeControlSupported(CTRL_MENU_POPUP, PART_MENU_SEPARATOR))
{
ControlState nState = ControlState::NONE;
- if (pData->bEnabled && !pWindow->IsEnabled())
+ if (pData->bEnabled && pWindow->IsEnabled())
nState |= ControlState::ENABLED;
if (bHighlighted)
nState |= ControlState::SELECTED;
@@ -1948,7 +1948,7 @@ void Menu::ImplPaint(vcl::RenderContext& rRenderContext,
if (pData->bChecked)
nState |= ControlState::PRESSED;
- if (pData->bEnabled && !pWindow->IsEnabled())
+ if (pData->bEnabled && pWindow->IsEnabled())
nState |= ControlState::ENABLED;
if (bHighlighted)
@@ -2089,7 +2089,7 @@ void Menu::ImplPaint(vcl::RenderContext& rRenderContext,
aSpacing = nOuterSpaceX;
}
- if (pData->bEnabled && !pWindow->IsEnabled())
+ if (pData->bEnabled && pWindow->IsEnabled())
nState |= ControlState::ENABLED;
if (bHighlighted)
nState |= ControlState::SELECTED;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
