Commit 0855e9e0 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Don't use active track tag to indicate muted tracks, instead fade its clips

parent e58e316f
Pipeline #11709 passed with stage
in 17 minutes and 7 seconds
......@@ -6,7 +6,6 @@ import com.enums 1.0
Row {
id: waveform
visible: clipStatus != ClipState.VideoOnly && parentTrack.isAudio && !parentTrack.isMute
opacity: clipStatus == ClipState.Disabled ? 0.2 : 1
property int maxWidth: 500 + 100 * timeline.scaleFactor
anchors.fill: parent
......
......@@ -8,7 +8,7 @@ Row {
id: thumbRow
anchors.fill: parent
visible: !isAudio
opacity: parentTrack.isAudio || parentTrack.isHidden || clipStatus == ClipState.Disabled ? 0.2 : 1
opacity: clipStatus == ClipState.Disabled ? 0.2 : 1
property int thumbWidth: container.height * 16.0/9.0
property bool enableCache: clipRoot.itemType == ProducerType.Video || clipRoot.itemType == ProducerType.AV
......
......@@ -25,14 +25,13 @@ Column{
property alias trackModel: trackModel.model
property alias rootIndex : trackModel.rootIndex
property bool isAudio
property bool isMute
property bool isHidden
property real timeScale: 1.0
property bool isCurrentTrack: false
property bool isLocked: false
property int trackInternalId : -42
property int trackThumbsFormat
property int itemType: 0
opacity: model.disabled ? 0.4 : 1
/*function redrawWaveforms() {
for (var i = 0; i < repeater.count; i++)
......
......@@ -270,14 +270,6 @@ Rectangle {
color: 'yellow'
}
},
State {
name: 'mute'
when: trackHeadRoot.isDisabled
PropertyChanges {
target: trackLed
color: 'orange'
}
},
State {
name: 'inactive'
when: !trackHeadRoot.isLocked && !trackHeadRoot.isActive
......
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