diff options
| author | nick_m <mainsbridge@gmail.com> | 2015-01-11 04:07:31 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2015-01-11 04:07:31 +1100 |
| commit | 44203ce955f33135065456f55f1f685131174ba6 (patch) | |
| tree | 623864e0e94e7d1fb59c5ee24bdbd16f551aee4b /gtk2_ardour/editor_selection.cc | |
| parent | 9e873acedb35ee0077f128a2da1648b65c78eeeb (diff) | |
Fix AutomationTrackItem rubberband click thinking it was unhandled.
Fix several other cases where a single mouse click could cause several
(not nested) selection ops.
Fix missing selection memento for midi notes and midi commands.
Rename some variables.
Fix random style issues.
Diffstat (limited to 'gtk2_ardour/editor_selection.cc')
| -rw-r--r-- | gtk2_ardour/editor_selection.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc index 60f8b0433b..c46ef04a64 100644 --- a/gtk2_ardour/editor_selection.cc +++ b/gtk2_ardour/editor_selection.cc @@ -202,8 +202,9 @@ Editor::set_selected_track_as_side_effect (Selection::Operation op) } } else if (group && group->is_active()) { for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) { - if ((*i)->route_group() == group) + if ((*i)->route_group() == group) { selection->remove(*i); + } } } else { selection->remove (clicked_axisview); @@ -215,8 +216,9 @@ Editor::set_selected_track_as_side_effect (Selection::Operation op) } } else if (group && group->is_active()) { for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) { - if ( (*i)->route_group() == group) + if ((*i)->route_group() == group) { selection->add(*i); + } } } else { selection->add (clicked_axisview); @@ -234,8 +236,9 @@ Editor::set_selected_track_as_side_effect (Selection::Operation op) } } else if (group && group->is_active()) { for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) { - if ((*i)->route_group() == group) + if ((*i)->route_group() == group) { selection->add(*i); + } } } else { selection->add (clicked_axisview); @@ -253,8 +256,9 @@ Editor::set_selected_track_as_side_effect (Selection::Operation op) } } else if (group && group->is_active()) { for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) { - if ((*i)->route_group() == group) + if ((*i)->route_group() == group) { selection->add(*i); + } } } else { selection->set (clicked_axisview); @@ -1953,7 +1957,7 @@ Editor::get_edit_op_range (framepos_t& start, framepos_t& end) const void Editor::deselect_all () { - begin_reversible_selection_op(_("Clear Selection")); + begin_reversible_selection_op(_("Deselect All")); selection->clear (); commit_reversible_selection_op (); } |