summaryrefslogtreecommitdiff
path: root/gtk2_ardour/processor_box.cc
diff options
context:
space:
mode:
authorBen Loftis <ben@harrisonconsoles.com>2014-08-28 14:25:19 -0500
committerBen Loftis <ben@harrisonconsoles.com>2014-08-28 14:25:19 -0500
commit730656863465250e8ed9f277cd5dd1409e9e46ac (patch)
treeed6115b2a2eff93b22f28ae5ce4f44731218a07d /gtk2_ardour/processor_box.cc
parent61c11157c0a8eabfeb6b3f1d01372b88342770ce (diff)
More fixes to ArdourButton actions.
Optionally allow events to fallthrough to parents, in particular for the DnDVBox case. Also allow the number_label to operate as a track selector.
Diffstat (limited to 'gtk2_ardour/processor_box.cc')
-rw-r--r--gtk2_ardour/processor_box.cc11
1 files changed, 7 insertions, 4 deletions
diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index f095896f40..abc88524a8 100644
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -501,6 +501,7 @@ ProcessorEntry::Control::Control (boost::shared_ptr<AutomationControl> c, string
{
_slider.set_controllable (c);
box.set_padding(0, 0, 4, 4);
+ _button.set_fallthrough_to_parent(true);
if (c->toggled()) {
_button.set_text (_name);
@@ -1312,6 +1313,12 @@ ProcessorBox::processor_button_press_event (GdkEventButton *ev, ProcessorEntry*
ret = true;
+ } else if (Keyboard::is_context_menu_event (ev)) {
+
+ show_processor_menu (ev->time);
+
+ ret = true;
+
} else if (processor && ev->button == 1 && selected) {
// this is purely informational but necessary for route params UI
@@ -1340,10 +1347,6 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev, ProcessorEntry
sigc::mem_fun(*this, &ProcessorBox::idle_delete_processor),
boost::weak_ptr<Processor>(processor)));
- } else if (Keyboard::is_context_menu_event (ev)) {
-
- show_processor_menu (ev->time);
-
} else if (processor && Keyboard::is_button2_event (ev)
#ifndef GTKOSX
&& (Keyboard::no_modifier_keys_pressed (ev) && ((ev->state & Gdk::BUTTON2_MASK) == Gdk::BUTTON2_MASK))