ardour/livetrax
13
0
Fork 0
Code

before pushing keybindings to GTK for menu display, make sure that we add back the META modifer that GTK expects

Browse Source
This commit is contained in:
Paul Davis 2016-07-18 14:42:13 -04:00
parent 1a55e83e98
commit 9f3a9ef02d
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libs/gtkmm2ext/bindings.cc
View File

@ -597,7 +597,20 @@ Bindings::push_to_gtk (KeyboardKey kb, RefPtr<Action> what)
* happens.
*/
Gtk::AccelMap::add_entry (what->get_accel_path(), kb.key(), (Gdk::ModifierType) kb.state());
int mod = kb.state();
#ifdef __APPLE__
/* See comments in Keyboard::Keyboard about GTK handling of MOD2, META and the Command key.
*
* If we do not do this, GTK+ won't show the correct text for shortcuts in menus.
*/
if (mod & GDK_MOD2_MASK) {
mod = mod | GDK_META_MASK;
}
#endif
Gtk::AccelMap::add_entry (what->get_accel_path(), kb.key(), (Gdk::ModifierType) mod);
}
}