Skip to content

C
core
Kaydet (Commit) 13d08f07 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

Resolves: tdf#92539 reversed logic on enable/disable 

Change-Id: I26ef918c0a68a84c22da3979c1180a2aee7a8109
üst ecbe2ef3
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
vcl/source/window/menu.cxx
Dosyayı görüntüle @ 13d08f07
...@@ -1892,7 +1892,7 @@ void Menu::ImplPaint(vcl::RenderContext& rRenderContext, ...@@ -1892,7 +1892,7 @@ void Menu::ImplPaint(vcl::RenderContext& rRenderContext,
if (rRenderContext.IsNativeControlSupported(CTRL_MENU_POPUP, PART_MENU_SEPARATOR)) if (rRenderContext.IsNativeControlSupported(CTRL_MENU_POPUP, PART_MENU_SEPARATOR))
{ {
ControlState nState = ControlState::NONE; ControlState nState = ControlState::NONE;
if (pData->bEnabled && !pWindow->IsEnabled()) if (pData->bEnabled && pWindow->IsEnabled())
nState |= ControlState::ENABLED; nState |= ControlState::ENABLED;
if (bHighlighted) if (bHighlighted)
nState |= ControlState::SELECTED; nState |= ControlState::SELECTED;
...@@ -1948,7 +1948,7 @@ void Menu::ImplPaint(vcl::RenderContext& rRenderContext, ...@@ -1948,7 +1948,7 @@ void Menu::ImplPaint(vcl::RenderContext& rRenderContext,
if (pData->bChecked) if (pData->bChecked)
nState |= ControlState::PRESSED; nState |= ControlState::PRESSED;
if (pData->bEnabled && !pWindow->IsEnabled()) if (pData->bEnabled && pWindow->IsEnabled())
nState |= ControlState::ENABLED; nState |= ControlState::ENABLED;
if (bHighlighted) if (bHighlighted)
...@@ -2089,7 +2089,7 @@ void Menu::ImplPaint(vcl::RenderContext& rRenderContext, ...@@ -2089,7 +2089,7 @@ void Menu::ImplPaint(vcl::RenderContext& rRenderContext,
aSpacing = nOuterSpaceX; aSpacing = nOuterSpaceX;
} }
if (pData->bEnabled && !pWindow->IsEnabled()) if (pData->bEnabled && pWindow->IsEnabled())
nState |= ControlState::ENABLED; nState |= ControlState::ENABLED;
if (bHighlighted) if (bHighlighted)
nState |= ControlState::SELECTED; nState |= ControlState::SELECTED;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment