diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelineview.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelineview.cpp index 51c88cbdcf7..ed35459ded3 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/timelineview.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/timelineview.cpp @@ -378,7 +378,7 @@ void TimelineView::addNewTimelineDialog() { auto timeline = addNewTimeline(); addAnimation(timeline); - activateTimeline(timeline); + setCurrentTimeline(timeline); openSettingsDialog(); } @@ -411,7 +411,7 @@ void TimelineView::setTimelineRecording(bool value) activateTimelineRecording(node); } else { deactivateTimelineRecording(); - activateTimeline(node); + setCurrentTimeline(node); } } diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinewidget.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelinewidget.cpp index f77ea14c7e1..a66250126bf 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/timelinewidget.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/timelinewidget.cpp @@ -391,7 +391,7 @@ void TimelineWidget::setTimelineRecording(bool value) timelineView()->activateTimelineRecording(node); } else { timelineView()->deactivateTimelineRecording(); - timelineView()->activateTimeline(node); + timelineView()->setCurrentTimeline(node); } graphicsScene()->invalidateRecordButtonsStatus(); diff --git a/src/plugins/qmldesigner/designercore/include/abstractview.h b/src/plugins/qmldesigner/designercore/include/abstractview.h index c6eb7507813..3908844dea4 100644 --- a/src/plugins/qmldesigner/designercore/include/abstractview.h +++ b/src/plugins/qmldesigner/designercore/include/abstractview.h @@ -280,7 +280,7 @@ public: virtual void contextHelp(const Core::IContext::HelpCallback &callback) const; - void activateTimeline(const ModelNode &timeline); + void setCurrentTimeline(const ModelNode &timeline); void activateTimelineRecording(const ModelNode &timeline); void deactivateTimelineRecording(); diff --git a/src/plugins/qmldesigner/designercore/model/abstractview.cpp b/src/plugins/qmldesigner/designercore/model/abstractview.cpp index e4e6b24d907..78916ff8842 100644 --- a/src/plugins/qmldesigner/designercore/model/abstractview.cpp +++ b/src/plugins/qmldesigner/designercore/model/abstractview.cpp @@ -639,7 +639,7 @@ void AbstractView::contextHelp(const Core::IContext::HelpCallback &callback) con #endif } -void AbstractView::activateTimeline(const ModelNode &timeline) +void AbstractView::setCurrentTimeline(const ModelNode &timeline) { if (currentTimeline().isValid()) currentTimeline().toogleRecording(false);