Commit f1a57d17 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle

Merge branch '1912'

parents 415b6f1a cb3ddf0b
Pipeline #11597 passed with stage
in 13 minutes and 48 seconds
......@@ -70,6 +70,7 @@ Rectangle {
property color borderColor: 'black'
property bool forceReloadThumb
property bool isComposition: false
property bool hideClipViews
property var groupTrimData
property int scrollStart: scrollView.flickableItem.contentX - clipRoot.modelStart * timeline.scaleFactor
width : clipDuration * timeScale;
......@@ -80,6 +81,10 @@ Rectangle {
signal initGroupTrim(var clip)
signal trimmingOut(var clip, real newDuration, var mouse, bool shiftTrim, bool controlTrim)
signal trimmedOut(var clip, bool shiftTrim, bool controlTrim)
onScrollStartChanged: {
clipRoot.hideClipViews = scrollStart > width || scrollStart + scrollView.viewport.width < 0
}
onIsGrabbedChanged: {
if (clipRoot.isGrabbed) {
......@@ -298,7 +303,7 @@ Rectangle {
asynchronous: true
visible: status == Loader.Ready
anchors.fill: parent
source: parentTrack.isAudio ? (timeline.showAudioThumbnails ? "ClipAudioThumbs.qml" : "") : itemType == ProducerType.Color ? "" : timeline.showThumbnails ? "ClipThumbs.qml" : ""
source: clipRoot.hideClipViews ? "" : parentTrack.isAudio ? (timeline.showAudioThumbnails ? "ClipAudioThumbs.qml" : "") : itemType == ProducerType.Color ? "" : timeline.showThumbnails ? "ClipThumbs.qml" : ""
onLoaded: {
item.reload()
}
......@@ -462,7 +467,7 @@ Rectangle {
inPoint: clipRoot.inPoint
outPoint: clipRoot.outPoint
masterObject: clipRoot
kfrModel: clipRoot.keyframeModel
kfrModel: clipRoot.hideClipViews ? 0 : clipRoot.keyframeModel
}
}
......
......@@ -61,6 +61,8 @@ Item {
property double speed: 1.0
property color color: displayRect.color
property color borderColor: 'black'
property bool hideCompoViews
property int scrollStart: scrollView.flickableItem.contentX - modelStart * timeline.scaleFactor
signal moved(var clip)
signal dragged(var clip, var mouse)
......@@ -71,6 +73,10 @@ Item {
signal trimmingOut(var clip, real newDuration, var mouse)
signal trimmedOut(var clip)
onScrollStartChanged: {
compositionRoot.hideCompoViews = compositionRoot.scrollStart > width || compositionRoot.scrollStart + scrollView.viewport.width < 0
}
onKeyframeModelChanged: {
if (effectRow.keyframecanvas) {
effectRow.keyframecanvas.requestPaint()
......@@ -236,7 +242,7 @@ Item {
inPoint: 0
outPoint: compositionRoot.clipDuration
masterObject: compositionRoot
kfrModel: compositionRoot.keyframeModel
kfrModel: compositionRoot.hideCompoViews ? 0 : compositionRoot.keyframeModel
}
}
/*Drag.active: mouseArea.drag.active
......
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