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

QmlDesigner: Avoid jumping cursors in integrated text editor

Browse Source 
If the curser changes this should not trigger an update in
the other direction.

Change-Id: Ie20914f5587525f46f2941de21374f4373cec47f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2019-04-02 14:43:22 +02:00
committed by Tim Jenssen
parent 257e45b4ec
commit d098016bd9
4 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmldesigner/components/texteditor/texteditorview.cpp
View File

@@ -172,6 +172,7 @@ void TextEditorView::nodeIdChanged(const ModelNode& /*node*/, const QString &/*n
void TextEditorView::selectedNodesChanged(const QList<ModelNode> &/*selectedNodeList*/, void TextEditorView::selectedNodesChanged(const QList<ModelNode> &/*selectedNodeList*/,
const QList<ModelNode> &/*lastSelectedNodeList*/) const QList<ModelNode> &/*lastSelectedNodeList*/)
{ {
if (!m_errorState)
m_widget->jumpTextCursorToSelectedModelNode(); m_widget->jumpTextCursorToSelectedModelNode();
} }
@@ -187,9 +188,11 @@ void TextEditorView::documentMessagesChanged(const QList<DocumentMessage> &error
{ {
if (errors.isEmpty()) { if (errors.isEmpty()) {
m_widget->clearStatusBar(); m_widget->clearStatusBar();
m_errorState = false;
} else { } else {
const DocumentMessage &error = errors.constFirst(); const DocumentMessage &error = errors.constFirst();
m_widget->setStatusText(QString("%1 (Line: %2)").arg(error.description()).arg(error.line())); m_widget->setStatusText(QString("%1 (Line: %2)").arg(error.description()).arg(error.line()));
m_errorState = true;
} }
} }

1
src/plugins/qmldesigner/components/texteditor/texteditorview.h
View File

@@ -103,6 +103,7 @@ public:
private: private:
QPointer<TextEditorWidget> m_widget; QPointer<TextEditorWidget> m_widget;
Internal::TextEditorContext *m_textEditorContext; Internal::TextEditorContext *m_textEditorContext;
bool m_errorState = false;
}; };
} // namespace QmlDesigner } // namespace QmlDesigner

5
src/plugins/qmldesigner/components/texteditor/texteditorwidget.cpp
View File

@@ -108,15 +108,20 @@ void TextEditorWidget::updateSelectionByCursorPosition()
const int cursorPosition = m_textEditor->editorWidget()->textCursor().position(); const int cursorPosition = m_textEditor->editorWidget()->textCursor().position();
RewriterView *rewriterView = m_textEditorView->model()->rewriterView(); RewriterView *rewriterView = m_textEditorView->model()->rewriterView();
m_blockRoundTrip = true;
if (rewriterView) { if (rewriterView) {
ModelNode modelNode = rewriterView->nodeAtTextCursorPosition(cursorPosition); ModelNode modelNode = rewriterView->nodeAtTextCursorPosition(cursorPosition);
if (modelNode.isValid() && !m_textEditorView->isSelectedModelNode(modelNode)) if (modelNode.isValid() && !m_textEditorView->isSelectedModelNode(modelNode))
m_textEditorView->setSelectedModelNode(modelNode); m_textEditorView->setSelectedModelNode(modelNode);
} }
m_blockRoundTrip = false;
} }
void TextEditorWidget::jumpTextCursorToSelectedModelNode() void TextEditorWidget::jumpTextCursorToSelectedModelNode()
{ {
if (m_blockRoundTrip)
return;
ModelNode selectedNode; ModelNode selectedNode;
if (hasFocus()) if (hasFocus())

1
src/plugins/qmldesigner/components/texteditor/texteditorwidget.h
View File

@@ -72,6 +72,7 @@ private:
QTimer m_updateSelectionTimer; QTimer m_updateSelectionTimer;
TextEditorStatusBar *m_statusBar; TextEditorStatusBar *m_statusBar;
bool m_blockCursorSelectionSynchronisation = false; bool m_blockCursorSelectionSynchronisation = false;
bool m_blockRoundTrip = false;
}; };
} // namespace QmlDesigner } // namespace QmlDesigner