diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-07-07 15:08:05 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-08-06 12:55:39 +0200 |
| commit | e1eb1ee4f789db43a0e8f6d8a27d522e04722895 (patch) | |
| tree | 0f06ce2f82301e99bb743b01a18abdc133cb8908 /vcl | |
| parent | 579adcefe47c99a4de27a76b8243b4d51a387816 (diff) | |
Resolves: tdf#92539 reversed logic on enable/disable
Change-Id: I26ef918c0a68a84c22da3979c1180a2aee7a8109
(cherry picked from commit 13d08f07b4d67afe211997ca37934c45208d50a6)
Reviewed-on: https://gerrit.libreoffice.org/16823
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/menu.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 8f2a93fc6043..4e2345a87460 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; |