ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Markers use the selection change stack.

This commit is contained in:
nick_m 2015-10-25 05:26:44 +11:00
parent d48564aee5
commit e78a44d4e5
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk2_ardour/editor_drag.cc
View File

@ -3757,6 +3757,7 @@ FadeOutDrag::aborted (bool)
MarkerDrag::MarkerDrag (Editor* e, ArdourCanvas::Item* i)
: Drag (e, i)
, _selection_changed (false)
{
DEBUG_TRACE (DEBUG::Drags, "New MarkerDrag\n");
@ -3812,6 +3813,7 @@ MarkerDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
case Selection::Set:
if (!_editor->selection->selected (_marker)) {
_editor->selection->set (_marker);
_selection_changed = true;
}
break;
case Selection::Extend:
@ -3841,11 +3843,14 @@ MarkerDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
}
if (!to_add.empty()) {
_editor->selection->add (to_add);
_selection_changed = true;
}
break;
}
case Selection::Add:
_editor->selection->add (_marker);
_selection_changed = true;
break;
}
@ -4051,17 +4056,19 @@ MarkerDrag::finished (GdkEvent* event, bool movement_occurred)
*/
Selection::Operation op = ArdourKeyboard::selection_type (event->button.state);
switch (op) {
case Selection::Set:
if (_editor->selection->selected (_marker) && _editor->selection->markers.size() > 1) {
_editor->selection->set (_marker);
_selection_changed = true;
}
break;
case Selection::Toggle:
/* we toggle on the button release, click only */
_editor->selection->toggle (_marker);
_selection_changed = true;
break;
case Selection::Extend:
@ -4069,6 +4076,11 @@ MarkerDrag::finished (GdkEvent* event, bool movement_occurred)
break;
}
if (_selection_changed) {
_editor->begin_reversible_selection_op(X_("Select Marker Release"));
_editor->commit_reversible_selection_op();
}
return;
}

2
gtk2_ardour/editor_drag.h
View File

@ -825,7 +825,7 @@ private:
void update_item (ARDOUR::Location *);
ArdourMarker* _marker; ///< marker being dragged
bool _selection_changed;
struct CopiedLocationMarkerInfo {
ARDOUR::Location* location;
std::vector<ArdourMarker*> markers;