ardour/livetrax
13
0
Fork 0
Code

more futzing with selections

Browse Source 
git-svn-id: svn://localhost/ardour2/trunk@1359 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2007-01-18 14:57:05 +00:00
parent 63daceea64
commit 058911a1d8
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk2_ardour/editor_mouse.cc
View File

@ -349,7 +349,7 @@ Editor::button_selection (ArdourCanvas::Item* item, GdkEvent* event, ItemType it
break; break;
case StreamItem: case StreamItem:
commit = set_selected_track_from_click (press, op, true); // commit = set_selected_track_from_click (press, op, true);
break; break;
case AutomationTrackItem: case AutomationTrackItem:
@ -508,9 +508,8 @@ Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemTyp
break; break;
case MouseObject: case MouseObject:
if (Keyboard::modifier_state_contains (event->button.state, if (Keyboard::modifier_state_contains (event->button.state, Keyboard::ModifierMask(Keyboard::Control|Keyboard::Alt)) &&
Keyboard::ModifierMask(Keyboard::Control|Keyboard::Alt)) event->type == GDK_BUTTON_PRESS) {
&& event->type == GDK_BUTTON_PRESS) {
start_rubberband_select (item, event); start_rubberband_select (item, event);

9
gtk2_ardour/selection.cc
View File

@ -209,9 +209,9 @@ Selection::toggle (RegionView* r)
RegionSelection::iterator i; RegionSelection::iterator i;
if ((i = find (regions.begin(), regions.end(), r)) == regions.end()) { if ((i = find (regions.begin(), regions.end(), r)) == regions.end()) {
regions.add (r); add (r);
} else { } else {
regions.erase (i); remove (*i);
} }
RegionsChanged (); RegionsChanged ();
@ -224,9 +224,9 @@ Selection::toggle (vector<RegionView*>& r)
for (vector<RegionView*>::iterator x = r.begin(); x != r.end(); ++x) { for (vector<RegionView*>::iterator x = r.begin(); x != r.end(); ++x) {
if ((i = find (regions.begin(), regions.end(), (*x))) == regions.end()) { if ((i = find (regions.begin(), regions.end(), (*x))) == regions.end()) {
regions.add ((*x)); add ((*x));
} else { } else {
regions.erase (i); remove (*x);
} }
} }
@ -322,6 +322,7 @@ Selection::add (RegionView* r)
{ {
if (find (regions.begin(), regions.end(), r) == regions.end()) { if (find (regions.begin(), regions.end(), r) == regions.end()) {
regions.add (r); regions.add (r);
add (&r->get_trackview());
RegionsChanged (); RegionsChanged ();
} }
} }