diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-01-18 14:57:05 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-01-18 14:57:05 +0000 |
| commit | 058911a1d8b4262518771343e0a26a70469e1d57 (patch) | |
| tree | 7ddcbfe3cbdfe845fe9680b91c978ecd2a68c046 /gtk2_ardour | |
| parent | 63daceea64bbb0b65b97305c5ecbd64411b2e1ff (diff) | |
more futzing with selections
git-svn-id: svn://localhost/ardour2/trunk@1359 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/editor_mouse.cc | 9 | ||||
| -rw-r--r-- | gtk2_ardour/selection.cc | 9 |
2 files changed, 9 insertions, 9 deletions
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index e49ac463da..dd28afb104 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -349,7 +349,7 @@ Editor::button_selection (ArdourCanvas::Item* item, GdkEvent* event, ItemType it break; case StreamItem: - commit = set_selected_track_from_click (press, op, true); + // commit = set_selected_track_from_click (press, op, true); break; case AutomationTrackItem: @@ -508,10 +508,9 @@ Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemTyp break; case MouseObject: - if (Keyboard::modifier_state_contains (event->button.state, - Keyboard::ModifierMask(Keyboard::Control|Keyboard::Alt)) - && event->type == GDK_BUTTON_PRESS) { - + if (Keyboard::modifier_state_contains (event->button.state, Keyboard::ModifierMask(Keyboard::Control|Keyboard::Alt)) && + event->type == GDK_BUTTON_PRESS) { + start_rubberband_select (item, event); } else if (event->type == GDK_BUTTON_PRESS) { diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc index ba0d51e606..baf2731e57 100644 --- a/gtk2_ardour/selection.cc +++ b/gtk2_ardour/selection.cc @@ -209,9 +209,9 @@ Selection::toggle (RegionView* r) RegionSelection::iterator i; if ((i = find (regions.begin(), regions.end(), r)) == regions.end()) { - regions.add (r); + add (r); } else { - regions.erase (i); + remove (*i); } RegionsChanged (); @@ -224,9 +224,9 @@ Selection::toggle (vector<RegionView*>& r) for (vector<RegionView*>::iterator x = r.begin(); x != r.end(); ++x) { if ((i = find (regions.begin(), regions.end(), (*x))) == regions.end()) { - regions.add ((*x)); + add ((*x)); } else { - regions.erase (i); + remove (*x); } } @@ -322,6 +322,7 @@ Selection::add (RegionView* r) { if (find (regions.begin(), regions.end(), r) == regions.end()) { regions.add (r); + add (&r->get_trackview()); RegionsChanged (); } } |