From 9f72bc56225e503cb377d47361ae3991101ccfdd Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Sat, 29 Dec 2018 21:49:40 +1100 Subject: [PATCH 1/2] changed one ripple behavior --- ui/timelinewidget.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ui/timelinewidget.cpp b/ui/timelinewidget.cpp index e96b87fc2..7a8ee4fbe 100644 --- a/ui/timelinewidget.cpp +++ b/ui/timelinewidget.cpp @@ -1283,8 +1283,10 @@ void TimelineWidget::update_ghosts(const QPoint& mouse_pos, bool lock_frame) { if (validator < 1) frame_diff -= (1 - validator); // prevent timeline in from going below 0 - validator = g.old_in + frame_diff; - if (validator < 0) frame_diff -= validator; + if (panel_timeline->tool != TIMELINE_TOOL_RIPPLE) { + validator = g.old_in + frame_diff; + if (validator < 0) frame_diff -= validator; + } // prevent clip_in from going below 0 if (c->media->get_type() == MEDIA_TYPE_SEQUENCE From 0047f6e260baa6b825b3b0d6a9b675bc2cee944d Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Sun, 30 Dec 2018 08:39:16 +1100 Subject: [PATCH 2/2] fixed crash when copying an effect after copying a clip --- panels/effectcontrols.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panels/effectcontrols.cpp b/panels/effectcontrols.cpp index eb5a4e20a..468fb43b5 100644 --- a/panels/effectcontrols.cpp +++ b/panels/effectcontrols.cpp @@ -111,9 +111,9 @@ void EffectControls::copy(bool del) { Effect* effect = c->effects.at(j); if (effect->container->selected) { if (!cleared) { - clipboard_type = CLIPBOARD_TYPE_EFFECT; clear_clipboard(); cleared = true; + clipboard_type = CLIPBOARD_TYPE_EFFECT; } clipboard.append(effect->copy(NULL));