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

QmlDesigner: Use AbstractView::currentTimeline in TimelineWidget

Browse Source 
AbstractView: :currentTimeline is the method that should be used.

Change-Id: I256b03691c114d44f807ce6a29f1f32f612545c9
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Thomas Hartmann
2021-04-20 16:22:25 +02:00
parent e6d2e81c07
commit e72cd12962
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmldesigner/components/timelineeditor/timelinewidget.cpp
View File

@@ -446,7 +446,7 @@ TimelineToolBar *TimelineWidget::toolBar() const
void TimelineWidget::invalidateTimelineDuration(const QmlTimeline &timeline) void TimelineWidget::invalidateTimelineDuration(const QmlTimeline &timeline)
{ {
if (timelineView() && timelineView()->model()) { if (timelineView() && timelineView()->model()) {
QmlTimeline currentTimeline = graphicsScene()->currentTimeline(); QmlTimeline currentTimeline = timelineView()->currentTimeline();
if (currentTimeline.isValid() && currentTimeline == timeline) { if (currentTimeline.isValid() && currentTimeline == timeline) {
m_toolbar->setStartFrame(timeline.startKeyframe()); m_toolbar->setStartFrame(timeline.startKeyframe());
m_toolbar->setEndFrame(timeline.endKeyframe()); m_toolbar->setEndFrame(timeline.endKeyframe());
@@ -470,7 +470,7 @@ void TimelineWidget::invalidateTimelineDuration(const QmlTimeline &timeline)
void TimelineWidget::invalidateTimelinePosition(const QmlTimeline &timeline) void TimelineWidget::invalidateTimelinePosition(const QmlTimeline &timeline)
{ {
if (timelineView() && timelineView()->model()) { if (timelineView() && timelineView()->model()) {
QmlTimeline currentTimeline = graphicsScene()->currentTimeline(); QmlTimeline currentTimeline = timelineView()->currentTimeline();
if (currentTimeline.isValid() && currentTimeline == timeline) { if (currentTimeline.isValid() && currentTimeline == timeline) {
qreal frame = getcurrentFrame(timeline); qreal frame = getcurrentFrame(timeline);
m_toolbar->setCurrentFrame(frame); m_toolbar->setCurrentFrame(frame);