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
22ddedb5
Commit
22ddedb5
authored
Mar 06, 2019
by
Jean-Baptiste Mardelle
Browse files
Ensure we don't try to fetch timeline thumbs when disabled
parent
2f3fbdbe
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/timeline2/view/qml/Clip.qml
View file @
22ddedb5
...
...
@@ -289,7 +289,7 @@ Rectangle {
Loader
{
id
:
thumbsLoader
anchors.fill
:
parent
source
:
parentTrack
.
isAudio
?
"
ClipAudioThumbs.qml
"
:
itemType
==
ProducerType
.
Color
?
""
:
"
ClipThumbs.qml
"
source
:
parentTrack
.
isAudio
?
(
timeline
.
showAudioThumbnails
?
"
ClipAudioThumbs.qml
"
:
""
)
:
itemType
==
ProducerType
.
Color
?
""
:
timeline
.
showThumbnails
?
"
ClipThumbs.qml
"
:
""
}
Rectangle
{
...
...
src/timeline2/view/qml/ClipAudioThumbs.qml
View file @
22ddedb5
...
...
@@ -6,7 +6,7 @@ import com.enums 1.0
Row
{
id
:
waveform
visible
:
clipStatus
!=
ClipState
.
VideoOnly
&&
parentTrack
.
isAudio
&&
timeline
.
showAudioThumbnails
&&
!
parentTrack
.
isMute
visible
:
clipStatus
!=
ClipState
.
VideoOnly
&&
parentTrack
.
isAudio
&&
!
parentTrack
.
isMute
opacity
:
clipStatus
==
ClipState
.
Disabled
?
0.2
:
1
property
int
maxWidth
:
2000
property
int
innerWidth
:
clipRoot
.
width
-
clipRoot
.
border
.
width
*
2
...
...
src/timeline2/view/qml/ClipThumbs.qml
View file @
22ddedb5
...
...
@@ -7,7 +7,7 @@ import com.enums 1.0
Row
{
id
:
thumbRow
anchors.fill
:
parent
visible
:
timeline
.
showThumbnails
&&
clipRoot
.
itemType
!=
ProducerType
.
Color
&&
!
isAudio
visible
:
!
isAudio
opacity
:
parentTrack
.
isAudio
||
parentTrack
.
isHidden
||
clipStatus
==
ClipState
.
Disabled
?
0.2
:
1
property
int
thumbWidth
:
container
.
height
*
16.0
/
9.0
property
int
scrollStart
:
Math
.
max
(
0
,
scrollView
.
flickableItem
.
contentX
/
timeline
.
scaleFactor
-
clipRoot
.
modelStart
)
...
...
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