Skip to content
GitLab
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
3b470425
Commit
3b470425
authored
Mar 12, 2020
by
Jean-Baptiste Mardelle
Browse files
Ensure frame position consistency for out operations.
Related to
#318
parent
1ffc0b61
Pipeline
#16373
passed with stage
in 17 minutes and 54 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/monitor/monitor.cpp
View file @
3b470425
...
...
@@ -686,7 +686,7 @@ void Monitor::slotSetZoneEnd(bool discardLastFrame)
{
Q_UNUSED
(
discardLastFrame
);
int
pos
=
m_glMonitor
->
getCurrentPos
();
if
(
m_controller
==
nullptr
)
{
if
(
m_controller
)
{
pos
++
;
}
m_glMonitor
->
getControllerProxy
()
->
setZoneOut
(
pos
);
...
...
src/timeline2/view/timelinecontroller.cpp
View file @
3b470425
...
...
@@ -799,7 +799,7 @@ void TimelineController::setOutPoint()
if
(
start
+
m_model
->
getItemPlaytime
(
id
)
==
cursorPos
)
{
continue
;
}
int
size
=
cursorPos
-
start
+
1
;
int
size
=
cursorPos
-
start
;
m_model
->
requestItemResize
(
id
,
size
,
true
,
true
,
0
,
false
);
selectionFound
=
true
;
}
...
...
@@ -815,7 +815,7 @@ void TimelineController::setOutPoint()
if
(
cid
>=
0
)
{
int
start
=
m_model
->
getItemPosition
(
cid
);
if
(
start
+
m_model
->
getItemPlaytime
(
cid
)
!=
cursorPos
)
{
int
size
=
cursorPos
-
start
+
1
;
int
size
=
cursorPos
-
start
;
m_model
->
requestItemResize
(
cid
,
size
,
true
,
true
,
0
,
false
);
}
}
...
...
Eugen Mohr
@emohr
mentioned in issue
#318 (closed)
·
Mar 12, 2020
mentioned in issue
#318 (closed)
mentioned in issue #318
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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