Commit 6c731f2f authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Fix same track transition resize glitch

parent 3c74efa3
Pipeline #145102 passed with stage
in 7 minutes and 23 seconds
......@@ -3121,7 +3121,7 @@ int TimelineModel::requestItemResize(int itemId, int size, bool right, bool logU
std::unordered_set<int> all_items;
QList <int> tracksWithMixes;
all_items.insert(itemId);
if (logUndo && isClip(itemId)) {
if (logUndo && isClip(itemId)) {
if (tid > -1) {
if (right) {
if (getTrackById_const(tid)->hasEndMix(itemId)) {
......
......@@ -634,8 +634,14 @@ Rectangle {
var currentClipPos = clipRoot.modelStart
var delta = currentFrame - currentClipPos
if (delta !== 0) {
if (delta > 0 && clipRoot.mixDuration > 0 && (clipRoot.mixDuration - clipRoot.mixCut - delta < 0)) {
return
if (delta > 0 && (clipRoot.mixDuration > 0 && clipRoot.mixDuration - clipRoot.mixCut - delta < (clipRoot.mixCut == 0 ? 1 : 0))) {
if (clipRoot.mixCut == 0 && clipRoot.mixDuration > 1) {
delta = clipRoot.mixDuration - clipRoot.mixCut - 1
} else if (clipRoot.mixCut > 0 && clipRoot.mixDuration > clipRoot.mixCut) {
delta = clipRoot.mixDuration - clipRoot.mixCut
} else {
return
}
}
var newDuration = 0;
if (root.activeTool === ProjectTool.RippleTool) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment