From f48361912b4b827d1110140f0ebc6d39d5b17520 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 5 Jun 2019 17:26:44 +0200 Subject: [PATCH] QmlDesigner: Fix duplication Change-Id: Id21eddf67f0a24de9dfde95d6cf5ed96ab4dc0ec Reviewed-by: Tim Jenssen --- .../components/propertyeditor/gradientmodel.cpp | 9 +++++++-- .../components/propertyeditor/gradientmodel.h | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.cpp b/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.cpp index 5728c594d48..471ec2abd4d 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.cpp @@ -181,7 +181,7 @@ void GradientModel::addGradient() setupModel(); if (m_gradientTypeName != "Gradient") - QTimer::singleShot(1000, [this](){ view()->resetPuppet(); }); /*Unfortunately required */ + resetPuppet(); /*Unfortunately required */ emit hasGradientChanged(); emit gradientTypeChanged(); } @@ -437,6 +437,11 @@ QmlDesigner::AbstractView *GradientModel::view() const return m_itemNode.view(); } +void GradientModel::resetPuppet() +{ + QTimer::singleShot(1000, [this]() { view()->resetPuppet(); }); +} + QmlDesigner::ModelNode GradientModel::createGradientNode() { QByteArray fullTypeName = m_gradientTypeName.toUtf8(); @@ -562,7 +567,7 @@ void GradientModel::setPresetByStops(const QList &stopsPositions, setupModel(); if (m_gradientTypeName != "Gradient") - QTimer::singleShot(200, [this]() { view()->resetPuppet(); }); /*Unfortunately required */ + resetPuppet(); /*Unfortunately required */ emit hasGradientChanged(); emit gradientTypeChanged(); diff --git a/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.h b/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.h index 0cc1a3c4ae5..c54526838e8 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.h +++ b/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.h @@ -108,6 +108,7 @@ private: void setupGradientProperties(const QmlDesigner::ModelNode &gradient); QmlDesigner::Model *model() const; QmlDesigner::AbstractView *view() const; + void resetPuppet(); }; QML_DECLARE_TYPE(GradientModel)