Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Kdenlive
Commits
9a89c55d
Commit
9a89c55d
authored
Dec 30, 2020
by
Jean-Baptiste Mardelle
Browse files
Fix tests
parent
1fbc03bb
Pipeline
#45782
canceled with stage
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/timeline2/model/timelinemodel.cpp
View file @
9a89c55d
...
...
@@ -2889,8 +2889,8 @@ int TimelineModel::requestItemResize(int itemId, int size, bool right, bool logU
int
offset
=
getItemPlaytime
(
itemId
);
int
tid
=
getItemTrackId
(
itemId
);
int
out
=
offset
;
if
(
tid
!=
-
1
)
{
in
=
getItemPosition
(
itemId
);
if
(
tid
!=
-
1
||
isComposition
(
itemId
)
)
{
in
=
qMax
(
0
,
getItemPosition
(
itemId
)
)
;
out
+=
in
;
size
=
requestItemResizeInfo
(
itemId
,
in
,
out
,
size
,
right
,
snapDistance
);
}
...
...
@@ -3090,11 +3090,10 @@ int TimelineModel::requestItemResize(int itemId, int size, bool right, bool logU
continue
;
}
if
(
right
)
{
finalSize
=
finalPos
-
getItemPosition
(
id
);
finalSize
=
finalPos
-
qMax
(
0
,
getItemPosition
(
id
)
)
;
}
else
{
finalSize
=
getItemPosition
(
id
)
+
getItemPlaytime
(
id
)
-
finalPos
;
finalSize
=
qMax
(
0
,
getItemPosition
(
id
)
)
+
getItemPlaytime
(
id
)
-
finalPos
;
}
result
=
result
&&
requestItemResize
(
id
,
finalSize
,
right
,
logUndo
,
undo
,
redo
);
resizedCount
++
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment