summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-11-08 17:38:43 +0000
committerMichael Stahl <mstahl@redhat.com>2017-11-24 17:47:47 +0100
commit13511a077bb85a68a3d29d081d0f88090028185f (patch)
treeaca6644ca03ef9156bf4807ca3f975097df3c630
parent7a53f646df5d295ed5ab21fa1ac467694160cf1f (diff)
Resolves: tdf#113562 desired window didn't get the input
Change-Id: I4a2089a715dc67783bfd18d2ee0e55193c4ed741 Reviewed-on: https://gerrit.libreoffice.org/44511 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--vcl/source/window/winproc.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 7a612ac0a494..9c900ce0e3d5 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -2089,10 +2089,11 @@ static void ImplHandleSalKeyMod( vcl::Window* pWindow, SalKeyModEvent* pEvent )
// #105224# send commandevent to allow special treatment of Ctrl-LeftShift/Ctrl-RightShift etc.
// + auto-accelerator feature, tdf#92630
- // find window
+ // try to find a key input window...
vcl::Window* pChild = ImplGetKeyInputWindow( pWindow );
- if ( !pChild )
- return;
+ //...otherwise fail safe...
+ if (!pChild)
+ pChild = pWindow;
CommandModKeyData data( pEvent->mnModKeyCode, pEvent->mbDown );
ImplCallCommand( pChild, CommandEventId::ModKeyChange, &data );