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

Merge remote-tracking branch 'origin/4.3' into 4.4

Browse Source 
Change-Id: I624040b7910d4025208709b22157869c6085df2f
This commit is contained in:
Eike Ziller
2017-07-05 14:55:46 +02:00
parent 78f9ff036f 8e72432654
commit 11333a03cd
3 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmljseditor/qmljseditor.cpp
View File

@@ -221,7 +221,7 @@ void QmlJSEditorWidget::modificationChanged(bool changed)
bool QmlJSEditorWidget::isOutlineCursorChangesBlocked() bool QmlJSEditorWidget::isOutlineCursorChangesBlocked()
{ {
return hasFocus() || m_blockOutLineCursorChanges; return hasFocus();
} }
void QmlJSEditorWidget::jumpToOutlineElement(int /*index*/) void QmlJSEditorWidget::jumpToOutlineElement(int /*index*/)
@@ -814,7 +814,6 @@ void QmlJSEditorWidget::showContextPane()
void QmlJSEditorWidget::contextMenuEvent(QContextMenuEvent *e) void QmlJSEditorWidget::contextMenuEvent(QContextMenuEvent *e)
{ {
m_blockOutLineCursorChanges = true;
QPointer<QMenu> menu(new QMenu(this)); QPointer<QMenu> menu(new QMenu(this));
QMenu *refactoringMenu = new QMenu(tr("Refactoring"), menu); QMenu *refactoringMenu = new QMenu(tr("Refactoring"), menu);
@@ -859,7 +858,6 @@ void QmlJSEditorWidget::contextMenuEvent(QContextMenuEvent *e)
menu->exec(e->globalPos()); menu->exec(e->globalPos());
delete menu; delete menu;
m_blockOutLineCursorChanges = false;
} }
bool QmlJSEditorWidget::event(QEvent *e) bool QmlJSEditorWidget::event(QEvent *e)

1
src/plugins/qmljseditor/qmljseditor.h
View File

@@ -122,7 +122,6 @@ private:
QTimer m_contextPaneTimer; QTimer m_contextPaneTimer;
QComboBox *m_outlineCombo; QComboBox *m_outlineCombo;
QModelIndex m_outlineModelIndex; QModelIndex m_outlineModelIndex;
bool m_blockOutLineCursorChanges = false;
QmlJS::ModelManagerInterface *m_modelManager = nullptr; QmlJS::ModelManagerInterface *m_modelManager = nullptr;
QmlJS::IContextPane *m_contextPane = nullptr; QmlJS::IContextPane *m_contextPane = nullptr;

51
src/plugins/qmljseditor/qmljsoutline.cpp
View File

@@ -125,6 +125,14 @@ void QmlJSOutlineWidget::setEditor(QmlJSEditorWidget *editor)
m_filterModel->setSourceModel(m_editor->qmlJsEditorDocument()->outlineModel()); m_filterModel->setSourceModel(m_editor->qmlJsEditorDocument()->outlineModel());
m_treeView->expandAll(); m_treeView->expandAll();
connect(m_editor->qmlJsEditorDocument()->outlineModel(), &QAbstractItemModel::modelAboutToBeReset, [this]() {
if (m_treeView && m_treeView->selectionModel())
m_treeView->selectionModel()->blockSignals(true);
});
connect(m_editor->qmlJsEditorDocument()->outlineModel(), &QAbstractItemModel::modelReset, [this]() {
if (m_treeView && m_treeView->selectionModel())
m_treeView->selectionModel()->blockSignals(false);
});
connect(m_treeView->selectionModel(), &QItemSelectionModel::selectionChanged, connect(m_treeView->selectionModel(), &QItemSelectionModel::selectionChanged,
this, &QmlJSOutlineWidget::updateSelectionInText); this, &QmlJSOutlineWidget::updateSelectionInText);
@@ -195,29 +203,34 @@ void QmlJSOutlineWidget::updateSelectionInText(const QItemSelection &selection)
void QmlJSOutlineWidget::updateTextCursor(const QModelIndex &index) void QmlJSOutlineWidget::updateTextCursor(const QModelIndex &index)
{ {
if (!m_editor->isOutlineCursorChangesBlocked()) { const auto update = [this](const QModelIndex &index) {
QModelIndex sourceIndex = m_filterModel->mapToSource(index); if (!m_editor->isOutlineCursorChangesBlocked()) {
AST::SourceLocation location QModelIndex sourceIndex = m_filterModel->mapToSource(index);
= m_editor->qmlJsEditorDocument()->outlineModel()->sourceLocation(sourceIndex);
if (!location.isValid()) AST::SourceLocation location
return; = m_editor->qmlJsEditorDocument()->outlineModel()->sourceLocation(sourceIndex);
const QTextBlock lastBlock = m_editor->document()->lastBlock(); if (!location.isValid())
const uint textLength = lastBlock.position() + lastBlock.length(); return;
if (location.offset >= textLength)
return;
Core::EditorManager::cutForwardNavigationHistory(); const QTextBlock lastBlock = m_editor->document()->lastBlock();
Core::EditorManager::addCurrentPositionToNavigationHistory(); const uint textLength = lastBlock.position() + lastBlock.length();
if (location.offset >= textLength)
return;
QTextCursor textCursor = m_editor->textCursor(); Core::EditorManager::cutForwardNavigationHistory();
m_blockCursorSync = true; Core::EditorManager::addCurrentPositionToNavigationHistory();
textCursor.setPosition(location.offset);
m_editor->setTextCursor(textCursor); QTextCursor textCursor = m_editor->textCursor();
m_editor->centerCursor();
m_blockCursorSync = false; textCursor.setPosition(location.offset);
} m_editor->setTextCursor(textCursor);
m_editor->centerCursor();
}
};
m_blockCursorSync = true;
update(index);
m_blockCursorSync = false;
} }
void QmlJSOutlineWidget::focusEditor() void QmlJSOutlineWidget::focusEditor()