diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-07-29 12:44:19 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-07-29 12:47:00 +0100 |
| commit | a840b2526b8b8e44991bef2eb7b6ba44a1a90d3a (patch) | |
| tree | 878f470d47ecae610ac66612a85ae1e881d34a9f /vcl/unx | |
| parent | b641d83bb9f8adba1a487ca0e04d7151f96c3eea (diff) | |
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
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkframe.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index c09a5cabac88..09a422bde588 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; } |