Commit 22ddedb5 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Ensure we don't try to fetch timeline thumbs when disabled

parent 2f3fbdbe
...@@ -289,7 +289,7 @@ Rectangle { ...@@ -289,7 +289,7 @@ Rectangle {
Loader { Loader {
id: thumbsLoader id: thumbsLoader
anchors.fill: parent 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 { Rectangle {
......
...@@ -6,7 +6,7 @@ import com.enums 1.0 ...@@ -6,7 +6,7 @@ import com.enums 1.0
Row { Row {
id: waveform 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 opacity: clipStatus == ClipState.Disabled ? 0.2 : 1
property int maxWidth: 2000 property int maxWidth: 2000
property int innerWidth: clipRoot.width - clipRoot.border.width * 2 property int innerWidth: clipRoot.width - clipRoot.border.width * 2
......
...@@ -7,7 +7,7 @@ import com.enums 1.0 ...@@ -7,7 +7,7 @@ import com.enums 1.0
Row { Row {
id: thumbRow id: thumbRow
anchors.fill: parent anchors.fill: parent
visible: timeline.showThumbnails && clipRoot.itemType != ProducerType.Color && !isAudio visible: !isAudio
opacity: parentTrack.isAudio || parentTrack.isHidden || clipStatus == ClipState.Disabled ? 0.2 : 1 opacity: parentTrack.isAudio || parentTrack.isHidden || clipStatus == ClipState.Disabled ? 0.2 : 1
property int thumbWidth: container.height * 16.0/9.0 property int thumbWidth: container.height * 16.0/9.0
property int scrollStart: Math.max(0, scrollView.flickableItem.contentX / timeline.scaleFactor - clipRoot.modelStart) property int scrollStart: Math.max(0, scrollView.flickableItem.contentX / timeline.scaleFactor - clipRoot.modelStart)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment