ardour/livetrax
13
0
Fork 0
Code

Clear selection on starting a MIDI note rubberband

Browse Source 
selection drag; always emit SelectionCleared() from
clear_selection_except even if this region's selection
hasn't changed, as we still want to clear the selection
in other regions.  Part of #4669.


git-svn-id: svn://localhost/ardour2/branches/3.0@12473 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2012-05-28 21:01:49 +00:00
parent cc12b6bba5
commit 5776407b3b
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gtk2_ardour/midi_region_view.cc
View File

@ -596,8 +596,8 @@ MidiRegionView::motion (GdkEventMotion* ev)
editor.verbose_cursor()->hide ();
return true;
} else if (m == MouseObject) {
editor.drags()->set (new MidiRubberbandSelectDrag (dynamic_cast<Editor *> (&editor), this), (GdkEvent *) ev);
clear_selection ();
_mouse_state = SelectRectDragging;
return true;
} else if (m == MouseRange) {
@ -1939,17 +1939,7 @@ MidiRegionView::delete_note (boost::shared_ptr<NoteType> n)
void
MidiRegionView::clear_selection_except (ArdourCanvas::CanvasNoteEvent* ev, bool signal)
{
bool changed = false;
if (ev && !ev->selected ()) {
/* We're selecting this note, so the selection has changed; if
there is nothing else currently selected, the loop below will
not pick up on the change.
*/
changed = true;
}
for (Selection::iterator i = _selection.begin(); i != _selection.end(); ) {
for (Selection::iterator i = _selection.begin(); i != _selection.end(); ) {
if ((*i) != ev) {
Selection::iterator tmp = i;
++tmp;
@ -1957,7 +1947,6 @@ MidiRegionView::clear_selection_except (ArdourCanvas::CanvasNoteEvent* ev, bool
(*i)->set_selected (false);
(*i)->hide_velocity ();
_selection.erase (i);
changed = true;
i = tmp;
} else {
@ -1969,7 +1958,7 @@ MidiRegionView::clear_selection_except (ArdourCanvas::CanvasNoteEvent* ev, bool
selection.
*/
if (changed && signal) {
if (signal) {
SelectionCleared (this); /* EMIT SIGNAL */
}
}