vcl/unx/gtk3/gtk3gtkframe.cxx | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
New commits:
commit a840b2526b8b8e44991bef2eb7b6ba44a1a90d3a
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Jul 29 12:44:19 2016 +0100
only map GDK_SUPER_MASK to KEY_MOD3 and not GDK_META_MASK
on wayland I'm getting a GDK_MOD1_MASK and a GDK_META_MASK
on pressing the left alt. The check for KEY_MOD2 in
Window::KeyInput trips up with the extra KEY_MOD3 bit set
so the auto mnemonic underlines don't appear on pressing
left alt under wayland
Lets map only GDK_SUPER_MASK to KEY_MOD3
Change-Id: I1e9cc9fc095f5edfa7ad7c71440232c6de1ecf04
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index c09a5ca..09a422b 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -121,10 +121,7 @@ static sal_uInt16 GetKeyModCode( guint state )
nCode |= KEY_MOD1;
if( (state & GDK_MOD1_MASK) )
nCode |= KEY_MOD2;
-
- // Map Meta/Super keys to MOD3 modifier on all Unix systems
- // except Mac OS X
- if ( (state & GDK_META_MASK ) || ( state & GDK_SUPER_MASK ) )
+ if( (state & GDK_SUPER_MASK) )
nCode |= KEY_MOD3;
return nCode;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
