Skip to content

Commit 45d4ce8

Browse files
committed
[ui] GraphEditor: Backdrop Node Animations considers reszing on Y and halts animation while resizing operations
1 parent 5836ac3 commit 45d4ce8

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

meshroom/ui/qml/GraphEditor/GraphEditor.qml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,18 +1096,18 @@ Item {
10961096
let children = getChildrenNodes();
10971097

10981098
for (var i = 0; i < children.length; i++) {
1099-
const delegate = children[i];
1099+
const delegate = children[i];
11001100

1101-
// Ignore the selected delegates as they will be iterated upon separately
1102-
if (delegate.selected)
1103-
continue;
1101+
// Ignore the selected delegates as they will be iterated upon separately
1102+
if (delegate.selected)
1103+
continue;
11041104

1105-
delegate.x = delegate.node.x + offset.x;
1106-
delegate.y = delegate.node.y + offset.y;
1105+
delegate.x = delegate.node.x + offset.x;
1106+
delegate.y = delegate.node.y + offset.y;
11071107

1108-
// If the delegate is not the current Node
1109-
if (delegate !== node)
1110-
nodes.push(delegate.node);
1108+
// If the delegate is not the current Node
1109+
if (delegate !== node)
1110+
nodes.push(delegate.node);
11111111
}
11121112

11131113
uigraph.nodeSelection.selectedIndexes.forEach(function(idx) {
@@ -1130,11 +1130,11 @@ Item {
11301130
}
11311131

11321132
Behavior on x {
1133-
enabled: !nodeRepeater.ongoingDrag && !resizing && !uigraph.animationsDisabled;
1133+
enabled: !nodeRepeater.ongoingDrag && !resizing && !uigraph.animationsDisabled;
11341134
NumberAnimation { duration: 100 }
11351135
}
11361136
Behavior on y {
1137-
enabled: !nodeRepeater.ongoingDrag
1137+
enabled: !nodeRepeater.ongoingDrag && !resizing && !uigraph.animationsDisabled;
11381138
NumberAnimation { duration: 100 }
11391139
}
11401140
}

0 commit comments

Comments
 (0)