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

QmlDesigner.toolbar: avoid issues during setup

Browse Source
This commit is contained in:
Thomas Hartmann
2010-07-26 13:47:22 +02:00
parent 2a90e47c19
commit 02eba4fb0c
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qmldesigner/qmlcontextpane.cpp
View File

@@ -77,6 +77,8 @@ void QmlContextPane::apply(TextEditor::BaseTextEditorEditable *editor, Document:
if (update && editor != m_editor) if (update && editor != m_editor)
return; //do not update for different editor return; //do not update for different editor
m_blockWriting = true;
LookupContext::Ptr lookupContext = LookupContext::create(doc, snapshot, QList<Node*>()); LookupContext::Ptr lookupContext = LookupContext::create(doc, snapshot, QList<Node*>());
const Interpreter::ObjectValue *scopeObject = doc->bind()->findQmlObject(node); const Interpreter::ObjectValue *scopeObject = doc->bind()->findQmlObject(node);
@@ -148,11 +150,8 @@ void QmlContextPane::apply(TextEditor::BaseTextEditorEditable *editor, Document:
contextWidget()->activate(p3 , p1, p2); contextWidget()->activate(p3 , p1, p2);
else else
contextWidget()->rePosition(p3 , p1, p2); contextWidget()->rePosition(p3 , p1, p2);
m_blockWriting = true;
contextWidget()->setPath(doc->path()); contextWidget()->setPath(doc->path());
contextWidget()->setProperties(&propertyReader); contextWidget()->setProperties(&propertyReader);
m_blockWriting = false;
m_doc = doc; m_doc = doc;
m_node = node; m_node = node;
} else { } else {
@@ -166,6 +165,8 @@ void QmlContextPane::apply(TextEditor::BaseTextEditorEditable *editor, Document:
contextWidget()->colorDialog()->hide(); contextWidget()->colorDialog()->hide();
} }
m_blockWriting = false;
} }
void QmlContextPane::setProperty(const QString &propertyName, const QVariant &value) void QmlContextPane::setProperty(const QString &propertyName, const QVariant &value)