summaryrefslogtreecommitdiff
path: root/vcl/source/window
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-02-09 10:26:05 +0000
committerAndras Timar <andras.timar@collabora.com>2017-02-27 10:42:13 +0100
commit6082d5ca8f398e9de07ed2329c4b6e728d2b7d7a (patch)
tree6604aa6ed5ea686e31bc5457f9db996cdee5c589 /vcl/source/window
parente75cdbb5d1abda25b4526c719e89e58b06ea8432 (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> (cherry picked from commit 0d8746c091ce3e70340c431da8d35d453d2b3b2c)
Diffstat (limited to 'vcl/source/window')
-rw-r--r--vcl/source/window/dialog.cxx2
-rw-r--r--vcl/source/window/menu.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 8b70c2ee8001..c01b23706d83 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -599,7 +599,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 89593b5c9eb1..da7213ec108b 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2632,7 +2632,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)