summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-11-08 17:38:43 +0000
committerCaolán McNamara <caolanm@redhat.com>2017-11-09 00:20:39 +0100
commit65d69d95e88de25bcb59486231d92ace6be5feed (patch)
tree404872dc5ce350781de4abedfca4813fb2a84874
parent9cb2962197b592a9b93dac2ea8b8f3652cb5fbcb (diff)
Resolves: tdf#113562 desired window didn't get the input
Change-Id: I4a2089a715dc67783bfd18d2ee0e55193c4ed741 Reviewed-on: https://gerrit.libreoffice.org/44500 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@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 fdc584eb7513..81cf9f67765f 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -2063,10 +2063,11 @@ static void ImplHandleSalKeyMod( vcl::Window* pWindow, SalKeyModEvent const * pE
// #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 );