feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/7.0' into 8.0

Browse Source 
Change-Id: I3780a56c1e02c2e98028aaf02b54733c6f222498
This commit is contained in:
Eike Ziller
2022-05-30 14:14:04 +02:00
parent 323ba720db 4b0f20f777
commit 09efabaf89
38 changed files with 644 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp
View File

@@ -148,16 +148,23 @@ void CurveEditorView::instancePropertyChanged(const QList<QPair<ModelNode, Prope
{
Q_UNUSED(propertyList);
for (const auto &pair : propertyList) {
if (!QmlTimeline::isValidQmlTimeline(pair.first))
continue;
if (auto timeline = activeTimeline(); timeline.isValid()) {
if (pair.second == "startFrame")
updateStartFrame(pair.first);
else if (pair.second == "endFrame")
updateEndFrame(pair.first);
else if (pair.second == "currentFrame")
updateCurrentFrame(pair.first);
auto timelineNode = timeline.modelNode();
for (const auto &pair : propertyList) {
if (!QmlTimeline::isValidQmlTimeline(pair.first))
continue;
if (pair.first != timelineNode)
continue;
if (pair.second == "startFrame")
updateStartFrame(pair.first);
else if (pair.second == "endFrame")
updateEndFrame(pair.first);
else if (pair.second == "currentFrame")
updateCurrentFrame(pair.first);
}
}
}