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:25:29 +0000 |
| commit | 0d8746c091ce3e70340c431da8d35d453d2b3b2c (patch) | |
| tree | 57c59450d65b0b4edb8a7190277bd2a05593567a | |
| parent | 756bf395326d188e93300b5a958851377e9256a2 (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
(cherry picked from commit f67dc04cfdd9e63a45ec6c8bc00829bce8f17d4b)
Change-Id: Iccc5dad7af41f39ac02d3be93e935f2d926a82a6
Reviewed-on: https://gerrit.libreoffice.org/34077
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | vcl/source/window/dialog.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/menu.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index e1603221ad4f..2cebcb16fe0e 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -598,7 +598,7 @@ IMPL_LINK_NOARG_TYPED(Dialog, ImplAsyncCloseHdl, void*, void) bool Dialog::ImplHandleCmdEvent( const CommandEvent& rCEvent ) { - if (rCEvent.GetCommand() == CommandEventId::ModKeyChange) + if (rCEvent.GetCommand() == CommandEventId::ModKeyChange && ImplGetSVData()->maNWFData.mbAutoAccel) { const CommandModKeyData *pCData = rCEvent.GetModKeyData (); bool bShowAccel = pCData && pCData->IsMod2(); diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index a647e88c81df..d7f6b0875fff 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -2570,7 +2570,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) |