[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - vcl/win

[Andras Timar]

 vcl/win/source/window/salframe.cxx |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit df00c67da8e8701179dbe66efa00e4a795d51700
Author: Andras Timar <andras.timar at collabora.com>
Date:   Tue Mar 22 22:14:51 2016 +0100

    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.

diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 62a0cf6..6acf7d8 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -3409,10 +3409,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) )
     {
@@ -3619,6 +3617,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