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
05b122c6
Commit
05b122c6
authored
Dec 07, 2019
by
Jean-Baptiste Mardelle
Browse files
Don't allow seeking below 0 (unexpected behavior)
parent
dd48f08e
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/monitor/monitor.cpp
View file @
05b122c6
...
@@ -1173,7 +1173,7 @@ void Monitor::slotForward(double speed)
...
@@ -1173,7 +1173,7 @@ void Monitor::slotForward(double speed)
void
Monitor
::
slotRewindOneFrame
(
int
diff
)
void
Monitor
::
slotRewindOneFrame
(
int
diff
)
{
{
slotActivateMonitor
();
slotActivateMonitor
();
m_glMonitor
->
getControllerProxy
()
->
setPosition
(
m_glMonitor
->
getCurrentPos
()
-
diff
);
m_glMonitor
->
getControllerProxy
()
->
setPosition
(
qMax
(
0
,
m_glMonitor
->
getCurrentPos
()
-
diff
)
)
;
}
}
void
Monitor
::
slotForwardOneFrame
(
int
diff
)
void
Monitor
::
slotForwardOneFrame
(
int
diff
)
...
...
src/timeline2/view/qml/timeline.qml
View file @
05b122c6
...
@@ -892,7 +892,7 @@ Rectangle {
...
@@ -892,7 +892,7 @@ Rectangle {
}
}
}
else
{
}
else
{
var
delta
=
wheel
.
modifiers
&
Qt
.
ShiftModifier
?
timeline
.
fps
()
:
1
var
delta
=
wheel
.
modifiers
&
Qt
.
ShiftModifier
?
timeline
.
fps
()
:
1
proxy
.
position
=
Math
.
m
in
(
root
.
consumerPosition
-
(
wheel
.
angleDelta
.
y
>
0
?
delta
:
-
delta
)
,
timeline
.
fullDuration
-
1
)
proxy
.
position
=
wheel
.
angleDelta
.
y
>
0
?
Math
.
m
ax
(
root
.
consumerPosition
-
delta
,
0
)
:
Math
.
min
(
root
.
consumerPosition
+
delta
,
timeline
.
fullDuration
-
1
)
}
}
}
}
onPressed
:
{
onPressed
:
{
...
...
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