diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-08-08 17:47:02 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-08-08 17:47:11 -0400 |
| commit | 3d400f97dd3afcde4c30a1a6c4a8a4ef50e83976 (patch) | |
| tree | 5000c7648b3a0c2fa08df5853f1f7f19169d1910 | |
| parent | 6a4fb5838463b4b2803b999b0df0ec5b0d9e399f (diff) | |
fix display of modifiers on OS X in the bindings editor
| -rw-r--r-- | libs/gtkmm2ext/bindings.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libs/gtkmm2ext/bindings.cc b/libs/gtkmm2ext/bindings.cc index 1d63cc0972..e25ed20f21 100644 --- a/libs/gtkmm2ext/bindings.cc +++ b/libs/gtkmm2ext/bindings.cc @@ -179,14 +179,16 @@ KeyboardKey::display_label () const #ifdef __APPLE__ /* We use both bits (MOD2|META) for Primary on OS X, - * but we don't want MOD2 showing up in listings. + * but we don't want MOD2 showing up in listings. So remove + * it and add back META. */ if (mod & GDK_MOD2_MASK) { - mod &= ~GDK_MOD2_MASK; + mod = (mod & ~GDK_MOD2_MASK) | GDK_META_MASK; } #endif + return gtk_accelerator_get_label (key(), (GdkModifierType) mod); } |