diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-10-08 18:05:40 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-10-08 18:05:40 +0000 |
| commit | 8795fc3e031896e56e08ea20303e85f51c9d5934 (patch) | |
| tree | 418f4ffe8d19985d5ca27a8b7058907cd1b483c9 | |
| parent | 8738b689e037c5db3d57bd071812b38e9875d141 (diff) | |
fix mis-handling of button press events on mute+solo that ought to forward to BindableButton
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@5757 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/route_ui.cc | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index c582a427d9..38629e35b4 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -232,14 +232,13 @@ RouteUI::mute_press(GdkEventButton* ev) } else { if (Keyboard::is_button2_event (ev)) { - // Primary-button2 click is the midi binding click - // button2-click is "momentary" - if (!Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier))) { - wait_for_release = true; + if (mute_button->on_button_press_event (ev)) { + return true; } else { - return false; - } + // button2-click is "momentary" + wait_for_release = true; + } } if (ev->button == 1 || Keyboard::is_button2_event (ev)) { @@ -325,14 +324,12 @@ RouteUI::solo_press(GdkEventButton* ev) if (Keyboard::is_button2_event (ev)) { - // Primary-button2 click is the midi binding click - // button2-click is "momentary" - - if (!Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier))) { - wait_for_release = true; + if (solo_button->on_button_press_event (ev)) { + return true; } else { - return false; - } + // button2-click is "momentary" + wait_for_release = true; + } } if (ev->button == 1 || Keyboard::is_button2_event (ev)) { |