diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/qmldesigner/components/timelineeditor/animationcurvedialog.cpp | 2 | ||||
-rw-r--r-- | src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/plugins/qmldesigner/components/timelineeditor/animationcurvedialog.cpp b/src/plugins/qmldesigner/components/timelineeditor/animationcurvedialog.cpp index abc7778125..08269f0a92 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/animationcurvedialog.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/animationcurvedialog.cpp @@ -33,7 +33,6 @@ AnimationCurveDialog::AnimationCurveDialog(QWidget *parent) : QDialog(parent) , m_editor(nullptr) { - setWindowFlag(Qt::WindowStaysOnTopHint, true); setWindowFlag(Qt::WindowContextHelpButtonHint, false); } @@ -41,7 +40,6 @@ AnimationCurveDialog::AnimationCurveDialog(DesignTools::CurveEditorModel *model, : QDialog(parent) , m_editor(nullptr) { - setWindowFlag(Qt::WindowStaysOnTopHint, true); setWindowFlag(Qt::WindowContextHelpButtonHint, false); setModel(model); } diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp index 33c6dafa34..6e6ae34e43 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp @@ -40,6 +40,7 @@ #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/command.h> +#include <coreplugin/icore.h> #include <utils/algorithm.h> @@ -101,7 +102,7 @@ QAction *createAction(const Core::Id &id, TimelineToolBar::TimelineToolBar(QWidget *parent) : QToolBar(parent) , m_grp() - , m_dialog() + , m_dialog(Core::ICore::dialogParent()) , m_curveModel(new AnimationCurveEditorModel(0., 500.)) { m_dialog.setModel(m_curveModel); @@ -221,7 +222,7 @@ void TimelineToolBar::removeTimeline(const QmlTimeline &timeline) void TimelineToolBar::openAnimationCurveEditor() { - m_dialog.open(); + m_dialog.show(); } void TimelineToolBar::updateCurve(DesignTools::PropertyTreeItem *item) |