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

Don't update design mode widgets while in text mode

Browse Source
This commit is contained in:
Kai Koehne
2010-01-18 14:33:53 +01:00
parent ed4118628d
commit f88bc5f3cd
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/designmode.cpp
View File

@@ -212,7 +212,7 @@ void DesignMode::modeChanged(Core::IMode *mode)
} else { } else {
if (m_isActive) { if (m_isActive) {
m_isActive = false; m_isActive = false;
// m_mainWidget->showEditor(0); m_mainWidget->showEditor(0);
} }
} }
} }

12
src/plugins/qmldesigner/designmodewidget.cpp
View File

@@ -282,13 +282,11 @@ void DocumentWidget::setAutoSynchronization(bool sync)
if (sync) { if (sync) {
// text editor -> visual editor // text editor -> visual editor
if (!document()->model()) { if (!document()->model()) {
// first initialization document()->loadMaster(m_textBuffer.data());
QList<RewriterView::Error> errors = document()->loadMaster(m_textBuffer.data());
if (!errors.isEmpty()) {
disable(errors);
} }
}
if (document()->model() && document()->qmlErrors().isEmpty()) { QList<RewriterView::Error> errors = document()->qmlErrors();
if (errors.isEmpty()) {
// set selection to text cursor // set selection to text cursor
RewriterView *rewriter = document()->rewriterView(); RewriterView *rewriter = document()->rewriterView();
const int cursorPos = m_textBuffer->textCursor().position(); const int cursorPos = m_textBuffer->textCursor().position();
@@ -297,6 +295,8 @@ void DocumentWidget::setAutoSynchronization(bool sync)
rewriter->setSelectedModelNodes(QList<ModelNode>() << node); rewriter->setSelectedModelNodes(QList<ModelNode>() << node);
} }
enable(); enable();
} else {
disable(errors);
} }
connect(document(), SIGNAL(qmlErrorsChanged(QList<RewriterView::Error>)), connect(document(), SIGNAL(qmlErrorsChanged(QList<RewriterView::Error>)),