smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 14:54:56 +01:00
Code Issues Projects Releases Wiki Activity

use Gtkmm2ext::BindingSet inside libgtkmm2ext

Browse source
This commit is contained in:
Paul Davis 2025-03-10 18:48:49 -06:00
parent 9472ca1a14
commit effe0bd879
3 changed files with 26 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
libs/gtkmm2ext/bindings.cc
View file

@ -1158,16 +1158,22 @@ std::ostream& operator<<(std::ostream& out, Gtkmm2ext::KeyboardKey const & k) {
<< hex << k.state() << dec << ' ' << show_gdk_event_state (k.state()); << hex << k.state() << dec << ' ' << show_gdk_event_state (k.state());
} }
void static void
set_widget_bindings (Gtk::Widget& w, Bindings& b, char const * const name) delete_binding_set (void* p)
{ {
BindingSet* bs = new BindingSet; delete (BindingSet*) p;
bs->push_back (&b);
w.set_data (name, bs);
} }
void void
set_widget_bindings (Gtk::Widget& w, BindingSet& bs, char const * const name) Gtkmm2ext::set_widget_bindings (Gtk::Widget& w, Bindings& b, char const * const name)
{
BindingSet* bs = new BindingSet;
bs->push_back (&b);
g_object_set_data_full (G_OBJECT(w.gobj()), name, bs, (GDestroyNotify) delete_binding_set);
}
void
Gtkmm2ext::set_widget_bindings (Gtk::Widget& w, BindingSet& bs, char const * const name)
{ {
w.set_data (name, &bs); w.set_data (name, &bs);
} }

16
libs/gtkmm2ext/gtk_ui.cc
View file

@ -387,17 +387,25 @@ UI::set_tip (Widget *w, const gchar *tip, const gchar *hlp)
if (action) { if (action) {
/* get_bindings_from_widget_hierarchy */ /* get_bindings_from_widget_hierarchy */
Widget* ww = w; Widget* ww = w;
Bindings* bindings = NULL; BindingSet* binding_set = nullptr;
do { do {
bindings = (Bindings*) ww->get_data ("ardour-bindings"); binding_set = (BindingSet*) ww->get_data ("ardour-bindings");
if (bindings) { if (binding_set) {
break; break;
} }
ww = ww->get_parent (); ww = ww->get_parent ();
} while (ww); } while (ww);
if (!bindings) { Bindings* bindings;
if (!binding_set) {
bindings = global_bindings; bindings = global_bindings;
} else {
/* Use only the first bindings for the widget when
looking up keys.
*/
assert (!binding_set->empty());
bindings = binding_set->front ();
} }
if (bindings) { if (bindings) {

2
libs/gtkmm2ext/gtkmm2ext/bindings.h
View file

@ -215,6 +215,8 @@ typedef std::vector<Bindings*> BindingSet;
void set_widget_bindings (Gtk::Widget&, Bindings&, char const * const name); void set_widget_bindings (Gtk::Widget&, Bindings&, char const * const name);
void set_widget_bindings (Gtk::Widget&, BindingSet&, char const * const name); void set_widget_bindings (Gtk::Widget&, BindingSet&, char const * const name);
static char const * const ARDOUR_BINDING_KEY = "ardour-bindings";
} // namespace } // namespace
std::ostream& operator<<(std::ostream& out, Gtkmm2ext::KeyboardKey const & k); std::ostream& operator<<(std::ostream& out, Gtkmm2ext::KeyboardKey const & k);