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

Merge remote-tracking branch 'origin/10.0'

Browse Source 
Conflicts:
	src/plugins/clangcodemodel/clangdlocatorfilters.cpp

Change-Id: If91f26625ea9620fb9fdbf45705b32f37cb7f158
This commit is contained in:
Eike Ziller
2023-02-10 10:43:06 +01:00
parent db720d271d 2a2f6afb04
commit 2f5aed6c78
347 changed files with 2409 additions and 13490 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/plugins/texteditor/texteditor.cpp
View File

@@ -775,7 +775,7 @@ public:
QList<QTextCursor> m_autoCompleteHighlightPos;
void updateAutoCompleteHighlight();
QList<int> m_cursorBlockNumbers;
QSet<int> m_cursorBlockNumbers;
int m_blockCount = 0;
QPoint m_markDragStart;
@@ -5450,21 +5450,18 @@ void TextEditorWidgetPrivate::updateCurrentLineHighlight()
q->viewport()->update(updateRect);
}
};
QList<int> cursorBlockNumbers;
for (const QTextCursor &c : m_cursors) {
int cursorBlockNumber = c.blockNumber();
if (!m_cursorBlockNumbers.contains(cursorBlockNumber))
updateBlock(c.block());
if (!cursorBlockNumbers.contains(c.blockNumber()))
cursorBlockNumbers << c.blockNumber();
}
if (m_cursorBlockNumbers != cursorBlockNumbers) {
for (int oldBlock : m_cursorBlockNumbers) {
if (!cursorBlockNumbers.contains(oldBlock))
updateBlock(m_document->document()->findBlockByNumber(oldBlock));
}
m_cursorBlockNumbers = cursorBlockNumbers;
}
QSet<int> cursorBlockNumbers;
for (const QTextCursor &c : m_cursors)
cursorBlockNumbers.insert(c.blockNumber());
const QSet<int> updateBlockNumbers = (cursorBlockNumbers - m_cursorBlockNumbers)
+ (m_cursorBlockNumbers - cursorBlockNumbers);
for (const int blockNumber : updateBlockNumbers)
updateBlock(m_document->document()->findBlockByNumber(blockNumber));
m_cursorBlockNumbers = cursorBlockNumbers;
}
void TextEditorWidget::slotCursorPositionChanged()