forked from qt-creator/qt-creator
Make the curveeditor state aware
Fixes: QDS-6872 Change-Id: I2fe733bf6c25d3517ff80d122977113e10bac627 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
@@ -215,11 +215,10 @@ QmlTimeline CurveEditorView::activeTimeline() const
|
|||||||
if (node.hasVariantProperty("enabled")
|
if (node.hasVariantProperty("enabled")
|
||||||
&& node.variantProperty("enabled").value().toBool())
|
&& node.variantProperty("enabled").value().toBool())
|
||||||
return QmlTimeline(node);
|
return QmlTimeline(node);
|
||||||
|
}
|
||||||
|
}
|
||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for (const ModelNode &node : allModelNodesOfType("QtQuick.Timeline.Timeline")) {
|
for (const ModelNode &node : allModelNodesOfType("QtQuick.Timeline.Timeline")) {
|
||||||
if (QmlTimeline::isValidQmlTimeline(node) && state.affectsModelNode(node)) {
|
if (QmlTimeline::isValidQmlTimeline(node) && state.affectsModelNode(node)) {
|
||||||
@@ -227,7 +226,8 @@ QmlTimeline CurveEditorView::activeTimeline() const
|
|||||||
if (!propertyChanges.isValid())
|
if (!propertyChanges.isValid())
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (node.hasVariantProperty("enabled") && node.variantProperty("enabled").value().toBool())
|
if (propertyChanges.modelNode().hasProperty("enabled") &&
|
||||||
|
propertyChanges.modelNode().variantProperty("enabled").value().toBool())
|
||||||
return QmlTimeline(node);
|
return QmlTimeline(node);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user