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

QmlDesigner.documentController: fix text design synchronisation

Browse Source 
The synchronisation of selection between text and designmode was broken.
This fixes a regression.

Change-Id: I4d3fd2f9716398a16e01ce3d389d099bfad1f66b
Reviewed-on: http://codereview.qt.nokia.com/401
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
This commit is contained in:
Thomas Hartmann
2011-06-08 17:25:28 +02:00
parent 2941045a9f
commit bfc68f150a
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -536,9 +536,13 @@ void DesignModeWidget::setAutoSynchronization(bool sync)
if (debug) if (debug)
qDebug() << Q_FUNC_INFO << sync; qDebug() << Q_FUNC_INFO << sync;
RewriterView *rewriter = m_currentDesignDocumentController->rewriterView();
m_currentDesignDocumentController->blockModelSync(!sync); m_currentDesignDocumentController->blockModelSync(!sync);
if (sync) { if (sync) {
if (rewriter && m_currentDesignDocumentController->model())
rewriter->setSelectedModelNodes(QList<ModelNode>());
// text editor -> visual editor // text editor -> visual editor
if (!m_currentDesignDocumentController->model()) { if (!m_currentDesignDocumentController->model()) {
m_currentDesignDocumentController->loadMaster(m_currentTextEdit.data()); m_currentDesignDocumentController->loadMaster(m_currentTextEdit.data());
@@ -549,10 +553,9 @@ void DesignModeWidget::setAutoSynchronization(bool sync)
QList<RewriterView::Error> errors = m_currentDesignDocumentController->qmlErrors(); QList<RewriterView::Error> errors = m_currentDesignDocumentController->qmlErrors();
if (errors.isEmpty()) { if (errors.isEmpty()) {
// set selection to text cursor // set selection to text cursor
RewriterView *rewriter = m_currentDesignDocumentController->rewriterView();
const int cursorPos = m_currentTextEdit->textCursor().position(); const int cursorPos = m_currentTextEdit->textCursor().position();
ModelNode node = nodeForPosition(cursorPos); ModelNode node = nodeForPosition(cursorPos);
if (node.isValid()) { if (rewriter && node.isValid()) {
rewriter->setSelectedModelNodes(QList<ModelNode>() << node); rewriter->setSelectedModelNodes(QList<ModelNode>() << node);
} }
enable(); enable();