From: Paul Davis Date: Mon, 8 Aug 2016 21:47:02 +0000 (-0400) Subject: fix display of modifiers on OS X in the bindings editor X-Git-Tag: 5.0-rc2~5 X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=3d400f97dd3afcde4c30a1a6c4a8a4ef50e83976;p=ardour.git fix display of modifiers on OS X in the bindings editor --- 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); }