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

qmldesigner: remove delayedResetView();

Browse Source 
Change-Id: Ie577b6b686a10e4e3525ba858a70bea0b4077566
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
This commit is contained in:
Tim Jenssen
2022-11-10 16:56:10 +01:00
parent 8c7ed5a03e
commit b10c135a10
2 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp
View File

@@ -320,16 +320,6 @@ MaterialEditorView *MaterialEditorView::instance()
return s_instance; return s_instance;
} }
void MaterialEditorView::delayedResetView()
{
// TODO: it seems the delayed reset is not needed. Leaving it commented out for now just in case it
// turned out to be needed. Otherwise will be removed after a small testing period.
// if (m_timerId)
// killTimer(m_timerId);
// m_timerId = startTimer(50);
resetView();
}
void MaterialEditorView::timerEvent(QTimerEvent *timerEvent) void MaterialEditorView::timerEvent(QTimerEvent *timerEvent)
{ {
if (m_timerId == timerEvent->timerId()) if (m_timerId == timerEvent->timerId())
@@ -929,7 +919,7 @@ void MaterialEditorView::currentStateChanged(const ModelNode &node)
{ {
QmlModelState newQmlModelState(node); QmlModelState newQmlModelState(node);
Q_ASSERT(newQmlModelState.isValid()); Q_ASSERT(newQmlModelState.isValid());
delayedResetView(); resetView();
} }
void MaterialEditorView::instancePropertyChanged(const QList<QPair<ModelNode, PropertyName> > &propertyList) void MaterialEditorView::instancePropertyChanged(const QList<QPair<ModelNode, PropertyName> > &propertyList)
@@ -964,7 +954,7 @@ void MaterialEditorView::nodeTypeChanged(const ModelNode &node, const TypeName &
{ {
if (node == m_selectedMaterial) { if (node == m_selectedMaterial) {
m_qmlBackEnd->contextObject()->setCurrentType(QString::fromLatin1(typeName)); m_qmlBackEnd->contextObject()->setCurrentType(QString::fromLatin1(typeName));
delayedResetView(); resetView();
} }
} }
@@ -972,7 +962,7 @@ void MaterialEditorView::rootNodeTypeChanged(const QString &type, int, int)
{ {
if (rootModelNode() == m_selectedMaterial) { if (rootModelNode() == m_selectedMaterial) {
m_qmlBackEnd->contextObject()->setCurrentType(type); m_qmlBackEnd->contextObject()->setCurrentType(type);
delayedResetView(); resetView();
} }
} }

1
src/plugins/qmldesigner/components/materialeditor/materialeditorview.h
View File

@@ -98,7 +98,6 @@ private:
void requestPreviewRender(); void requestPreviewRender();
void applyMaterialToSelectedModels(const ModelNode &material, bool add = false); void applyMaterialToSelectedModels(const ModelNode &material, bool add = false);
void delayedResetView();
void setupQmlBackend(); void setupQmlBackend();
void commitVariantValueToModel(const PropertyName &propertyName, const QVariant &value); void commitVariantValueToModel(const PropertyName &propertyName, const QVariant &value);