Reinstate the ability to split regions while dragging playhead. I think this was unintentionally lost.
This commit is contained in:
parent
fcabb27561
commit
d88cdcc1bf
|
@ -4674,8 +4674,9 @@ Editor::get_preferred_edit_position (EditIgnoreOption ignore, bool from_context_
|
||||||
|
|
||||||
switch (ep) {
|
switch (ep) {
|
||||||
case EditAtPlayhead:
|
case EditAtPlayhead:
|
||||||
if (_dragging_playhead && _control_scroll_target) {
|
if (_dragging_playhead) {
|
||||||
where = *_control_scroll_target;
|
/* NOTE: since the user is dragging with the mouse, this operation will implicitly be Snapped */
|
||||||
|
where = playhead_cursor->current_sample();
|
||||||
} else {
|
} else {
|
||||||
where = _session->audible_sample();
|
where = _session->audible_sample();
|
||||||
}
|
}
|
||||||
|
@ -5792,9 +5793,7 @@ Editor::super_rapid_screen_update ()
|
||||||
if (!UIConfiguration::instance().get_show_snapped_cursor()) {
|
if (!UIConfiguration::instance().get_show_snapped_cursor()) {
|
||||||
snapped_cursor->hide ();
|
snapped_cursor->hide ();
|
||||||
} else if (_edit_point == EditAtPlayhead && !_dragging_playhead) {
|
} else if (_edit_point == EditAtPlayhead && !_dragging_playhead) {
|
||||||
snap_to (where); // can't use snap_to_with_modifier?
|
/* EditAtPlayhead does not snap */
|
||||||
snapped_cursor->set_position (where.sample);
|
|
||||||
snapped_cursor->show ();
|
|
||||||
} else if (_edit_point == EditAtSelectedMarker) {
|
} else if (_edit_point == EditAtSelectedMarker) {
|
||||||
/* NOTE: I don't think EditAtSelectedMarker should snap. They are what they are.
|
/* NOTE: I don't think EditAtSelectedMarker should snap. They are what they are.
|
||||||
* however, the current editing code -does- snap so I'll draw it that way for now.
|
* however, the current editing code -does- snap so I'll draw it that way for now.
|
||||||
|
|
|
@ -6348,7 +6348,10 @@ Editor::set_playhead_cursor ()
|
||||||
void
|
void
|
||||||
Editor::split_region ()
|
Editor::split_region ()
|
||||||
{
|
{
|
||||||
if (_drags->active ()) {
|
if (_dragging_playhead) {
|
||||||
|
/*continue*/
|
||||||
|
} else if (_drags->active ()) {
|
||||||
|
/*any other kind of drag, bail out so we avoid Undo snafu*/
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user