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
e4c9bebe
Commit
e4c9bebe
authored
Jun 07, 2021
by
Jean-Baptiste Mardelle
Browse files
Fix resize clip end does not allow touching next clip.
Fixes
#907
parent
f4a08219
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/timeline2/view/timelinecontroller.cpp
View file @
e4c9bebe
...
...
@@ -957,10 +957,13 @@ void TimelineController::setOutPoint()
if
(
!
selectionFound
)
{
if
(
m_activeTrack
>=
0
)
{
int
cid
=
m_model
->
getClipByPosition
(
m_activeTrack
,
cursorPos
);
if
(
cid
<
0
)
{
// Check first item after timeline position
int
minimumSpace
=
m_model
->
getTrackById_const
(
m_activeTrack
)
->
getBlankStart
(
cursorPos
);
cid
=
m_model
->
getClipByPosition
(
m_activeTrack
,
qMax
(
0
,
minimumSpace
-
1
));
if
(
cid
<
0
||
cursorPos
==
m_model
->
getItemPosition
(
cid
))
{
// If no clip found at cursor pos or we are at the first frame of a clip, try to find previous clip
// Check first item before timeline position
// If we are at a clip start, check space before this clip
int
offset
=
cid
>=
0
?
1
:
0
;
int
previousPos
=
m_model
->
getTrackById_const
(
m_activeTrack
)
->
getBlankStart
(
cursorPos
-
offset
);
cid
=
m_model
->
getClipByPosition
(
m_activeTrack
,
qMax
(
0
,
previousPos
-
1
));
}
if
(
cid
>=
0
)
{
int
start
=
m_model
->
getItemPosition
(
cid
);
...
...
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