diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-02-09 10:26:05 +0000 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-02-13 08:15:25 +0000 |
| commit | 1cd4913603d112b47106939de350aaca3143d37a (patch) | |
| tree | 73f1fc3db3676d40978a84fbb74c092cc632c86d | |
| parent | 0d3b87795f14d826810deacb9f460011f88181dc (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
(cherry picked from commit f67dc04cfdd9e63a45ec6c8bc00829bce8f17d4b)
Reviewed-on: https://gerrit.libreoffice.org/34076
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -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 934fdb095684..e88914c2d361 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -2556,7 +2556,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 e7e6683b74e5..f31dff20abf4 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -164,7 +164,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(); |