Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Kdenlive
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
259
Issues
259
List
Boards
Labels
Service Desk
Milestones
Merge Requests
14
Merge Requests
14
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Multimedia
Kdenlive
Commits
44ce7aea
Commit
44ce7aea
authored
Aug 06, 2020
by
Jean-Baptiste Mardelle
2
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix clip monitor zoom not reset when changing clip, and zone incorrect on zoom
parent
7c8de1f6
Pipeline
#29845
passed with stage
in 11 minutes and 4 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 @
44ce7aea
...
...
@@ -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 @
44ce7aea
...
...
@@ -75,11 +75,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
()
...
...
@@ -88,6 +83,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
...
...
Jean-Baptiste Mardelle
@mardelle
mentioned in commit
c533d8a0
·
Aug 06, 2020
mentioned in commit
c533d8a0
mentioned in commit c533d8a02ffdea8ed8ff6ae886cdb52022f13083
Toggle commit list
Jean-Baptiste Mardelle
@mardelle
mentioned in merge request
!128 (merged)
·
Aug 06, 2020
mentioned in merge request
!128 (merged)
mentioned in merge request !128
Toggle commit list
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