From d71768eaaeeb6289cc177e91d0e7a15dc5b8ae6b Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Mon, 15 Apr 2019 13:02:03 +0200 Subject: [PATCH] Don't allow composition resize on very small zoom levels (messes with move) --- src/timeline2/view/qml/Composition.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/timeline2/view/qml/Composition.qml b/src/timeline2/view/qml/Composition.qml index 10a69b2d3..7e304affd 100644 --- a/src/timeline2/view/qml/Composition.qml +++ b/src/timeline2/view/qml/Composition.qml @@ -260,7 +260,7 @@ Item { Drag.active: trimInMouseArea.drag.active Drag.proposedAction: Qt.MoveAction enabled: !compositionRoot.grouped - visible: root.activeTool === 0 && !dragProxyArea.drag.active + visible: trimInMouseArea.pressed || (root.activeTool === 0 && !dragProxyArea.drag.active && compositionRoot.width > 4 * width) MouseArea { id: trimInMouseArea @@ -310,7 +310,7 @@ Item { Drag.active: trimOutMouseArea.drag.active Drag.proposedAction: Qt.MoveAction enabled: !compositionRoot.grouped - visible: root.activeTool === 0 && !dragProxyArea.drag.active + visible: trimOutMouseArea.pressed || (root.activeTool === 0 && !dragProxyArea.drag.active && compositionRoot.width > 4 * width) MouseArea { id: trimOutMouseArea -- 2.24.0