projects
/
ardour.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6a4fb58
)
fix display of modifiers on OS X in the bindings editor
author
Paul Davis
<paul@linuxaudiosystems.com>
Mon, 8 Aug 2016 21:47:02 +0000
(17:47 -0400)
committer
Paul Davis
<paul@linuxaudiosystems.com>
Mon, 8 Aug 2016 21:47:11 +0000
(17:47 -0400)
libs/gtkmm2ext/bindings.cc
patch
|
blob
|
history
diff --git
a/libs/gtkmm2ext/bindings.cc
b/libs/gtkmm2ext/bindings.cc
index 1d63cc097237875ad982ac71d0755c67af5da7e8..e25ed20f210db3804b578340e0b3b840869352b4 100644
(file)
--- 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,
#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) {
*/
if (mod & GDK_MOD2_MASK) {
- mod
&= ~GDK_MOD2
_MASK;
+ mod
= (mod & ~GDK_MOD2_MASK) | GDK_META
_MASK;
}
#endif
}
#endif
+
return gtk_accelerator_get_label (key(), (GdkModifierType) mod);
}
return gtk_accelerator_get_label (key(), (GdkModifierType) mod);
}