From 1cd4913603d112b47106939de350aaca3143d37a Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 9 Feb 2017 10:26:05 +0000 Subject: 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 Reviewed-by: Miklos Vajna --- vcl/source/window/menu.cxx | 2 +- vcl/source/window/syswin.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'vcl/source') 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(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(); -- cgit