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
ffb46fde
Commit
ffb46fde
authored
Jan 06, 2021
by
Jean-Baptiste Mardelle
Browse files
Fix disabled clip regression (color and opacity changes were not applied anymore)
Fixes
#905
parent
ad01afc9
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/timeline2/view/qml/Clip.qml
View file @
ffb46fde
...
@@ -186,8 +186,8 @@ Rectangle {
...
@@ -186,8 +186,8 @@ Rectangle {
}
}
function
getColor
()
{
function
getColor
()
{
if
(
clipState
==
ClipState
.
Disabled
)
{
if
(
clipRoot
.
clipState
==
ClipState
.
Disabled
)
{
return
'
grey
'
return
'
#888
'
}
}
if
(
clipRoot
.
tagColor
)
{
if
(
clipRoot
.
tagColor
)
{
return
clipRoot
.
tagColor
return
clipRoot
.
tagColor
...
...
src/timeline2/view/qml/Track.qml
View file @
ffb46fde
...
@@ -209,8 +209,8 @@ Item{
...
@@ -209,8 +209,8 @@ Item{
}
}
Binding
{
Binding
{
target
:
loader
.
item
target
:
loader
.
item
property
:
"
clipStat
us
"
property
:
"
clipStat
e
"
value
:
model
.
clipStat
us
value
:
model
.
clipStat
e
when
:
loader
.
status
==
Loader
.
Ready
&&
isClip
(
model
.
clipType
)
when
:
loader
.
status
==
Loader
.
Ready
&&
isClip
(
model
.
clipType
)
}
}
Binding
{
Binding
{
...
...
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