diff options
| author | Ben Loftis <ben@harrisonconsoles.com> | 2014-07-24 11:28:31 -0500 |
|---|---|---|
| committer | Ben Loftis <ben@harrisonconsoles.com> | 2014-07-24 11:28:31 -0500 |
| commit | 61c66afd4c54888449cb5ac635f9694cd8415e37 (patch) | |
| tree | b69c8d0417a3103c211e86734e8f8f2e86dede25 /gtk2_ardour/mixer_ui.cc | |
| parent | 05f3adaba3eb42ba407864dd04064472e68948a6 (diff) | |
Revert previous select-strips-under-mouse behavior
However, keep the path for deletions in the editor-mixer via _entered_mixer_strip
TODO: if nothing was deleted, assume the user was trying to delete something in the editor instead
Show selected plugins by a red border
TODO: more work on the selection model for plugins and mixer strips
Diffstat (limited to 'gtk2_ardour/mixer_ui.cc')
| -rw-r--r-- | gtk2_ardour/mixer_ui.cc | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index 9db4b0bde3..e9c36690a6 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -392,7 +392,6 @@ Mixer_UI::add_strips (RouteList& routes) strip->WidthChanged.connect (sigc::mem_fun(*this, &Mixer_UI::strip_width_changed)); strip->signal_button_release_event().connect (sigc::bind (sigc::mem_fun(*this, &Mixer_UI::strip_button_release_event), strip)); - strip->signal_enter_notify_event().connect (sigc::bind (sigc::mem_fun(*this, &Mixer_UI::strip_enter_event), strip)); } } catch (...) { @@ -636,19 +635,6 @@ Mixer_UI::strip_by_route (boost::shared_ptr<Route> r) } bool -Mixer_UI::strip_enter_event (GdkEventCrossing *ev, MixerStrip *strip) -{ - if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { - ; //don't change the current selection, user is doing it manually - } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) { - _selection.add (strip); - } else - _selection.set (strip); - return false; -} - - -bool Mixer_UI::strip_button_release_event (GdkEventButton *ev, MixerStrip *strip) { if (ev->button == 1) { |