Move selection related code into SelectionModel

And fix a bug where the curves where missing in the graphicsview after opening the
AnimationCurveDialog a second time.

Change-Id: I4f13bd345afafaa0578a3be28be6326fa232dbe1
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>

3 files changed, 5 insertions, 4 deletions

diff --git a/src/plugins/qmldesigner/components/timelineeditor/animationcurvedialog.cpp b/src/plugins/qmldesigner/components/timelineeditor/animationcurvedialog.cpp
index 08269f0a92..2c4fb147b0 100644
--- a/src/plugins/qmldesigner/components/timelineeditor/animationcurvedialog.cpp
+++ b/src/plugins/qmldesigner/components/timelineeditor/animationcurvedialog.cpp
@@ -56,9 +56,10 @@ void AnimationCurveDialog::setModel(DesignTools::CurveEditorModel *model)
     setLayout(layout);
 }
 
-void AnimationCurveDialog::showEvent(QShowEvent *)
+void AnimationCurveDialog::refresh()
 {
-    m_editor->clearCanvas();
+    if (m_editor)
+        m_editor->clearCanvas();
 }
 
 } // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/components/timelineeditor/animationcurvedialog.h b/src/plugins/qmldesigner/components/timelineeditor/animationcurvedialog.h
index a567adec78..1bb20a3174 100644
--- a/src/plugins/qmldesigner/components/timelineeditor/animationcurvedialog.h
+++ b/src/plugins/qmldesigner/components/timelineeditor/animationcurvedialog.h
@@ -42,8 +42,7 @@ public:
 
     void setModel(DesignTools::CurveEditorModel *model);
 
-protected:
-    void showEvent(QShowEvent *event) override;
+    void refresh();
 
 private:
     DesignTools::CurveEditor *m_editor;
diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp
index a233e19aad..4c4e1e38f0 100644
--- a/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp
+++ b/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp
@@ -232,6 +232,7 @@ void TimelineToolBar::openAnimationCurveEditor()
             timeline = tlv->timelineForState(tlv->currentState());
     }
 
+    m_dialog.refresh();
     m_curveModel->setTimeline(timeline);
     m_dialog.show();
 }