diff options
| author | Andras Timar <andras.timar@collabora.com> | 2016-03-22 22:14:51 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-02-24 15:44:06 +0100 |
| commit | 3bf22f1690434862bbba486ca8b9abb1924c320c (patch) | |
| tree | cbd4435e5c1759593a745278b928ee0eda867014 /vcl | |
| parent | db6cc6accdc1180b0e6fcba4a99ce4e1e1b84d08 (diff) | |
Revert "tdf#95761 All Hotkeys with CTRL+ALT+ not worked"
This reverts commit 5deedec2ab708b841d0d696c8039c7fbcd4e62a7.
It is a bad idea to use Ctrl+Alt accelerator keys.
It fixes tdf#97908.
(cherry picked from commit df00c67da8e8701179dbe66efa00e4a795d51700)
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/win/window/salframe.cxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx index 42baae8ef715..7c234c5dd3e9 100644 --- a/vcl/win/window/salframe.cxx +++ b/vcl/win/window/salframe.cxx @@ -3375,10 +3375,8 @@ static long ImplHandleKeyMsg( HWND hWnd, UINT nMsg, nModCode |= KEY_SHIFT; if ( GetKeyState( VK_CONTROL ) & 0x8000 ) nModCode |= KEY_MOD1; - if ( GetKeyState( VK_LMENU ) & 0x8000 ) + if ( GetKeyState( VK_MENU ) & 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) ) { @@ -3585,6 +3583,13 @@ 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 |