Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Multimedia
Kdenlive
Commits
c533d8a0
Commit
c533d8a0
authored
Aug 06, 2020
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix clip monitor zoom not reset when changing clip, and zone incorrect on zoom
(cherry picked from commit
44ce7aea
)
parent
9a053d65
Pipeline
#29875
passed with stage
in 10 minutes and 9 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
src/monitor/view/MonitorRuler.qml
src/monitor/view/MonitorRuler.qml
+2
-2
src/monitor/view/kdenliveclipmonitor.qml
src/monitor/view/kdenliveclipmonitor.qml
+6
-5
No files found.
src/monitor/view/MonitorRuler.qml
View file @
c533d8a0
...
...
@@ -362,8 +362,8 @@ Rectangle {
id
:
zone
visible
:
controller
.
zoneOut
>
controller
.
zoneIn
color
:
activePalette
.
highlight
x
:
controller
.
zoneIn
*
root
.
timeScale
/
root
.
zoomFactor
-
ruler
.
rulerZoomOffset
width
:
(
controller
.
zoneOut
-
controller
.
zoneIn
)
*
root
.
timeScale
/
root
.
zoomFactor
x
:
controller
.
zoneIn
*
root
.
timeScale
-
ruler
.
rulerZoomOffset
width
:
(
controller
.
zoneOut
-
controller
.
zoneIn
)
*
root
.
timeScale
anchors.bottom
:
parent
.
bottom
height
:
ruler
.
height
/
2
opacity
:
0.8
...
...
src/monitor/view/kdenliveclipmonitor.qml
View file @
c533d8a0
...
...
@@ -73,11 +73,6 @@ Item {
onDurationChanged
:
{
clipMonitorRuler
.
updateRuler
()
// Reset zoom on clip change
root
.
zoomStart
=
0
root
.
zoomFactor
=
1
root
.
showZoomBar
=
false
root
.
zoomOffset
=
0
}
onWidthChanged
:
{
clipMonitorRuler
.
updateRuler
()
...
...
@@ -86,6 +81,12 @@ Item {
// Animate clip name
clipNameLabel
.
opacity
=
1
showAnimate
.
restart
()
// Reset zoom on clip change
root
.
zoomStart
=
0
root
.
zoomFactor
=
1
root
.
showZoomBar
=
false
root
.
zoomOffset
=
0
// adjust monitor image size if audio thumb is displayed
if
(
audioThumb
.
stateVisible
&&
root
.
permanentAudiothumb
&&
audioThumb
.
visible
)
{
controller
.
rulerHeight
=
audioThumb
.
height
+
root
.
zoomOffset
...
...
Write
Preview
Markdown
is supported
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