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

QmlDesigner: avoid syncronization errors when going to text mode and back

Browse Source 
To be safe to change to the base state (and back).

Reviewed-by: Kai Koehne
This commit is contained in:
Thomas Hartmann
2011-03-22 12:33:32 +01:00
parent ce80090d19
commit d3eaf05077
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
View File

@@ -161,8 +161,19 @@ void DesignDocumentController::detachNodeInstanceView()
void DesignDocumentController::attachNodeInstanceView() void DesignDocumentController::attachNodeInstanceView()
{ {
QmlModelState state;
if (m_d->nodeInstanceView) if (m_d->nodeInstanceView)
model()->attachView(m_d->nodeInstanceView.data()); model()->attachView(m_d->nodeInstanceView.data());
//We go back to base state (and back again) to avoid side effects from text editing.
if (m_d->statesEditorView) {
state = m_d->statesEditorView->currentState();
m_d->statesEditorView->setCurrentState(m_d->statesEditorView->baseState());
}
if (state.isValid() && m_d->statesEditorView)
m_d->statesEditorView->setCurrentState(state);
} }
QWidget *DesignDocumentController::centralWidget() const QWidget *DesignDocumentController::centralWidget() const