Commit 8b41ca25 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Fix clip thumbs disappearing on timeline resize

parent ad23bd66
Pipeline #62964 passed with stage
in 8 minutes and 44 seconds
...@@ -37,6 +37,8 @@ Row { ...@@ -37,6 +37,8 @@ Row {
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
asynchronous: true asynchronous: true
cache: enableCache cache: enableCache
//sourceSize.width: width
//sourceSize.height: height
property int currentFrame: fixedThumbs ? 0 : thumbRepeater.count < 3 ? (index == 0 ? thumbRepeater.thumbStartFrame : thumbRepeater.thumbEndFrame) : Math.floor(clipRoot.inPoint + Math.round((index) * width / timeline.scaleFactor)* clipRoot.speed) property int currentFrame: fixedThumbs ? 0 : thumbRepeater.count < 3 ? (index == 0 ? thumbRepeater.thumbStartFrame : thumbRepeater.thumbEndFrame) : Math.floor(clipRoot.inPoint + Math.round((index) * width / timeline.scaleFactor)* clipRoot.speed)
horizontalAlignment: thumbRepeater.count < 3 ? (index == 0 ? Image.AlignLeft : Image.AlignRight) : Image.AlignLeft horizontalAlignment: thumbRepeater.count < 3 ? (index == 0 ? Image.AlignLeft : Image.AlignRight) : Image.AlignLeft
source: thumbRepeater.count < 3 ? (clipRoot.baseThumbPath + currentFrame) : (index * width < clipRoot.scrollStart - width || index * width > clipRoot.scrollStart + scrollView.width) ? '' : clipRoot.baseThumbPath + currentFrame source: thumbRepeater.count < 3 ? (clipRoot.baseThumbPath + currentFrame) : (index * width < clipRoot.scrollStart - width || index * width > clipRoot.scrollStart + scrollView.width) ? '' : clipRoot.baseThumbPath + currentFrame
...@@ -47,26 +49,16 @@ Row { ...@@ -47,26 +49,16 @@ Row {
} }
} }
} }
BusyIndicator { Image {
running: parent.status != Image.Ready id: thumbPlaceholder
visible: parent.status != Image.Ready
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: index < thumbRepeater.count - 1 ? 0 : parent.width - thumbRow.thumbWidth - 1 anchors.leftMargin: index < thumbRepeater.count - 1 ? 0 : parent.width - thumbRow.thumbWidth - 1
implicitWidth: thumbRepeater.imageWidth width: parent.width
implicitHeight: container.height height: parent.height
hoverEnabled: false horizontalAlignment: Image.AlignLeft
visible: running fillMode: Image.PreserveAspectFit
contentItem: asynchronous: true
Image {
id: thumbPlaceholder
visible: parent.running
width: parent.width
height: parent.height
sourceSize.width: width
sourceSize.height: height
horizontalAlignment: Image.AlignLeft
fillMode: Image.PreserveAspectFit
asynchronous: true
}
} }
Rectangle { Rectangle {
visible: thumbRepeater.count < 3 visible: thumbRepeater.count < 3
......
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