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
bc3e0604
Commit
bc3e0604
authored
Mar 01, 2020
by
Jean-Baptiste Mardelle
Browse files
Fix clips having size bigger than their parent track
parent
0df4fccc
Pipeline
#15856
passed with stage
in 13 minutes and 53 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/timeline2/view/qml/timeline.qml
View file @
bc3e0604
...
...
@@ -658,16 +658,16 @@ Rectangle {
width
:
headerWidth
current
:
item
===
timeline
.
activeTrack
trackId
:
item
height
:
Math
.
max
(
collapsedHeight
,
model
.
trackHeight
)
height
:
model
.
trackHeight
onIsLockedChanged
:
tracksRepeater
.
itemAt
(
index
).
isLocked
=
isLocked
collapsed
:
height
<=
collapsedHeight
collapsed
:
height
<=
root
.
collapsedHeight
onMyTrackHeightChanged
:
{
collapsed
=
myTrackHeight
<=
collapsedHeight
collapsed
=
myTrackHeight
<=
root
.
collapsedHeight
if
(
!
collapsed
)
{
controller
.
setTrackProperty
(
trackId
,
"
kdenlive:trackheight
"
,
myTrackHeight
)
controller
.
setTrackProperty
(
trackId
,
"
kdenlive:collapsed
"
,
"
0
"
)
}
else
{
controller
.
setTrackProperty
(
trackId
,
"
kdenlive:collapsed
"
,
collapsedHeight
)
controller
.
setTrackProperty
(
trackId
,
"
kdenlive:collapsed
"
,
root
.
collapsedHeight
)
}
// hack: change property to trigger transition adjustment
root
.
trackHeight
=
root
.
trackHeight
===
1
?
0
:
1
...
...
@@ -1165,7 +1165,7 @@ Rectangle {
width
:
tracksContainerArea
.
width
border.width
:
1
border.color
:
root
.
frameColor
height
:
Math
.
max
(
collapsedHeight
,
model
.
trackHeight
)
height
:
model
.
trackHeight
color
:
tracksRepeater
.
itemAt
(
index
)
?
((
tracksRepeater
.
itemAt
(
index
).
trackInternalId
===
timeline
.
activeTrack
)
?
Qt
.
tint
(
getTrackColor
(
tracksRepeater
.
itemAt
(
index
).
isAudio
,
false
),
selectedTrackColor
)
:
getTrackColor
(
tracksRepeater
.
itemAt
(
index
).
isAudio
,
false
))
:
'
red
'
}
}
...
...
@@ -1278,7 +1278,7 @@ Rectangle {
rootIndex
:
trackDelegateModel
.
modelIndex
(
index
)
timeScale
:
timeline
.
scaleFactor
width
:
tracksContainerArea
.
width
height
:
Math
.
max
(
root
.
baseUnit
*
2
,
trackHeight
)
height
:
trackHeight
isAudio
:
audio
trackThumbsFormat
:
thumbsFormat
isCurrentTrack
:
item
===
timeline
.
activeTrack
...
...
Pistos Pi
@pistospi
mentioned in issue
#575 (closed)
·
Mar 01, 2020
mentioned in issue
#575 (closed)
mentioned in issue #575
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