diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-02-09 10:26:05 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-02-09 10:28:44 +0000 |
| commit | f67dc04cfdd9e63a45ec6c8bc00829bce8f17d4b (patch) | |
| tree | d5dee8b63dc57917fcf280c099ffe4f08ae31117 | |
| parent | b52948a77d1da6b0b983d5ef6f1d67e253be4ef2 (diff) | |
Resolves: tdf#101972 skip invalidating labels on alt if autoaccel is disabled
so no Invalidate will be called if auto accelerators are not enabled
so there should be no blinking under windows
Change-Id: Iccc5dad7af41f39ac02d3be93e935f2d926a82a6
| -rw-r--r-- | vcl/source/window/menu.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/syswin.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 00b931e32ba9..5a1a2f74efa3 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -2554,7 +2554,7 @@ bool MenuBar::ImplHandleCmdEvent( const CommandEvent& rCEvent ) MenuBarWindow* pWin = static_cast<MenuBarWindow*>(ImplGetWindow()); if ( pWin && pWin->IsEnabled() && pWin->IsInputEnabled() && ! pWin->IsInModalMode() ) { - if (rCEvent.GetCommand() == CommandEventId::ModKeyChange) + if (rCEvent.GetCommand() == CommandEventId::ModKeyChange && ImplGetSVData()->maNWFData.mbAutoAccel) { const CommandModKeyData* pCData = rCEvent.GetModKeyData (); if (pWin->nHighlightedItem == ITEMPOS_INVALID) diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index 4932deee1a4f..a8ed067a5b4e 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -159,7 +159,7 @@ namespace bool Accelerator::ToggleMnemonicsOnHierarchy(const CommandEvent& rCEvent, vcl::Window *pWindow) { - if (rCEvent.GetCommand() == CommandEventId::ModKeyChange) + if (rCEvent.GetCommand() == CommandEventId::ModKeyChange && ImplGetSVData()->maNWFData.mbAutoAccel) { const CommandModKeyData *pCData = rCEvent.GetModKeyData(); const bool bShowAccel = pCData && pCData->IsMod2(); |