strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tdf#95761 All Hotkeys with CTRL+ALT+ not worked

Browse source 
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>
This commit is contained in:
Juergen Funk 2015-11-12 10:50:59 +01:00 committed by Caolán McNamara
parent 0b3fbf8299
commit 3ac9942c62
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
vcl/win/source/window/salframe.cxx
View file

@ -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