[multimedia/kdenlive] src/timeline2/view/qml: Merge branch 'release/26.08'
Jean-Baptiste Mardelle <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit 66fa872fbb0e363c4d98362471f9334e4637a388 by Jean-Baptiste Mardelle.
Committed on 20/07/2026 at 19:08.
Pushed by mardelle into branch 'master'.
Merge branch 'release/26.08'
M +2 -5 src/timeline2/view/qml/Clip.qml
https://invent.kde.org/multimedia/kdenlive/-/commit/66fa872fbb0e363c4d98362471f9334e4637a388
diff --cc src/timeline2/view/qml/Clip.qml
index 0c02cf1a66,640d417233..7a004146ac
--- a/src/timeline2/view/qml/Clip.qml
+++ b/src/timeline2/view/qml/Clip.qml
@@@ -408,9 -400,6 +408,8 @@@ Rectangle
Component {
id: videoThumb
ClipThumbs {
+ visible: !clipRoot.isAudio
+ opacity: clipRoot.clipState === K.PlaylistState.Disabled ? 0.2 : 1
-
parentClip: clipRoot
initialSpeed: clipRoot.speed
}
@@@ -683,9 -673,6 +682,8 @@@
property bool hasRange: false
property real duration: 0
property int id
-
+ signal restorePositionBindings()
+
width: hasRange ? Math.max(1, Math.round(duration / clipRoot.speed * clipRoot.timeScale)) : 1
height: hasRange ? textMetrics.height + 2 : container.height
x: clipRoot.speed < 0
@@@ -1037,14 -1028,6 +1035,13 @@@
value: loader.modelData.id
when: loader.isInside && loader.status == Loader.Ready
}
+ Connections {
+ target: loader.item
+ function onRestorePositionBindings() {
+ loader.item.position = Qt.binding(function() { return loader.modelData.frame })
+ loader.item.duration = Qt.binding(function() { return loader.modelData.duration || 0 })
+ }
+ }
-
sourceComponent: markerComponent
}
}