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
ec712303
Commit
ec712303
authored
Mar 23, 2021
by
Jean-Baptiste Mardelle
Browse files
Fix broken compositions (incorrect qml comparison change in recent commit)
parent
09c6656a
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/timeline2/view/qml/Track.qml
View file @
ec712303
...
...
@@ -38,7 +38,7 @@ Item{
}
function
isClip
(
type
)
{
return
type
!=
ProducerType
.
Composition
&&
type
!=
ProducerType
.
Track
;
return
type
!=
=
ProducerType
.
Composition
&&
type
!=
=
ProducerType
.
Track
;
}
width
:
clipRow
.
width
...
...
@@ -91,7 +91,7 @@ Item{
target
:
loader
.
item
property
:
"
selected
"
value
:
model
.
selected
when
:
loader
.
status
==
Loader
.
Ready
&&
model
.
clipType
!=
ProducerType
.
Track
when
:
loader
.
status
==
Loader
.
Ready
&&
model
.
clipType
!=
=
ProducerType
.
Track
}
Binding
{
target
:
loader
.
item
...
...
@@ -393,7 +393,7 @@ Item{
Composition
{
displayHeight
:
Math
.
max
(
trackRoot
.
height
/
2
,
trackRoot
.
height
-
(
root
.
baseUnit
*
2
))
opacity
:
0.8
selected
:
root
.
timelineSelection
.
indexOf
(
clipId
)
!=
-
1
selected
:
root
.
timelineSelection
.
indexOf
(
clipId
)
!=
=
-
1
onTrimmingIn
:
{
var
new_duration
=
controller
.
requestItemResize
(
clip
.
clipId
,
newDuration
,
false
,
false
,
root
.
snapping
)
if
(
new_duration
>
0
)
{
...
...
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