diff options
| author | Juergen Funk <juergen.funk_ml@cib.de> | 2015-11-12 10:50:59 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-11-12 14:14:32 +0000 |
| commit | 3ac9942c624cb627c8b09122498b45b05cf455f6 (patch) | |
| tree | 95dd8dcaecc1485ea77b24bb91d57f377e8c8e2c /vcl | |
| parent | 0b3fbf8299c51767689b4e7656bbf4c331450b98 (diff) | |
tdf#95761 All Hotkeys with CTRL+ALT+ not worked
The problem was always masked out the combination ALT+CTRL, this only
needed when press the ALTGR key, but the other ALT-Key (left side) is
valid.
Change-Id: I8a6f953f519627418fb48ee8d1d68b3cbf797250
Reviewed-on: https://gerrit.libreoffice.org/19923
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/win/source/window/salframe.cxx | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 0203b05232b3..705335f17a49 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -3399,8 +3399,10 @@ static long ImplHandleKeyMsg( HWND hWnd, UINT nMsg, nModCode |= KEY_SHIFT; if ( GetKeyState( VK_CONTROL ) & 0x8000 ) nModCode |= KEY_MOD1; - if ( GetKeyState( VK_MENU ) & 0x8000 ) + if ( GetKeyState( VK_LMENU ) & 0x8000 ) nModCode |= KEY_MOD2; + if ( GetKeyState( VK_RMENU ) & 0x8000 ) // this is the ALTGR-Key in this case + nModCode &= ~KEY_MOD1; // remove the Control flag if ( (nMsg == WM_CHAR) || (nMsg == WM_SYSCHAR) ) { @@ -3607,13 +3609,6 @@ static long ImplHandleKeyMsg( HWND hWnd, UINT nMsg, aKeyEvt.mnCode |= nModCode; aKeyEvt.mnRepeat = nRepeat; - if( (nModCode & (KEY_MOD1|KEY_MOD2)) == (KEY_MOD1|KEY_MOD2) && - aKeyEvt.mnCharCode ) - { - // this is actually AltGr and should not be handled as Alt - aKeyEvt.mnCode &= ~(KEY_MOD1|KEY_MOD2); - } - bIgnoreCharMsg = bCharPeek ? TRUE : FALSE; long nRet = pFrame->CallCallback( nEvent, &aKeyEvt ); // independent part only reacts on keyup but Windows does not send |