From 8ae81f5a40ebd8cbb27679173b3a821bd315cf17 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 20 Apr 2021 16:23:06 +0200 Subject: [PATCH] QmlDesigner: Use QmlTimeline::insertKeyframe in TimelineView Change-Id: I22df18aba407b9c49a3aceb46169fd90efe73942 Reviewed-by: Knud Dollereder Reviewed-by: Thomas Hartmann --- .../timelineeditor/timelineview.cpp | 20 ++++--------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelineview.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelineview.cpp index 9f87a33c002..a8d0d740823 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/timelineview.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/timelineview.cpp @@ -430,23 +430,11 @@ void TimelineView::customNotification(const AbstractView * /*view*/, void TimelineView::insertKeyframe(const ModelNode &target, const PropertyName &propertyName) { - QmlTimeline timeline = widget()->graphicsScene()->currentTimeline(); - ModelNode targetNode = target; - if (timeline.isValid() && targetNode.isValid() - && QmlObjectNode::isValidQmlObjectNode(targetNode)) { - executeInTransaction("TimelineView::insertKeyframe", [=, &timeline, &targetNode]() { - targetNode.validId(); + QmlTimeline timeline = currentTimeline(); - QmlTimelineKeyframeGroup timelineFrames( - timeline.keyframeGroup(targetNode, propertyName)); - - QTC_ASSERT(timelineFrames.isValid(), return ); - - const qreal frame - = timeline.modelNode().auxiliaryData("currentFrame@NodeInstance").toReal(); - const QVariant value = QmlObjectNode(targetNode).instanceValue(propertyName); - - timelineFrames.setValue(value, frame); + if (timeline.isValid() && target.isValid() && QmlObjectNode::isValidQmlObjectNode(target)) { + executeInTransaction("TimelineView::insertKeyframe", [=, &timeline, &target]() { + timeline.insertKeyframe(target, propertyName); }); } }