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

Editor: prevent repainting complete editor with for current line

Browse Source 
Instead make sure that the widget is updated after the current line
changes.

Task-number: QTCREATORBUG-26812
Change-Id: I9fc754255891ec29d3499da0ee23aa56b1f285aa
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2022-03-11 14:15:01 +01:00
parent b5457750f2
commit d776445953
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4242,9 +4242,6 @@ void TextEditorWidgetPrivate::paintCurrentLineHighlight(const PaintEventData &da
lineRect.moveTop(lineRect.top() + blockRect.top()); lineRect.moveTop(lineRect.top() + blockRect.top());
lineRect.setLeft(0); lineRect.setLeft(0);
lineRect.setRight(data.viewportRect.width()); lineRect.setRight(data.viewportRect.width());
// set alpha, otherwise we cannot see block highlighting and find scope underneath
if (!data.eventRect.contains(lineRect.toAlignedRect()))
q->viewport()->update(lineRect.toAlignedRect());
painter.fillRect(lineRect, color); painter.fillRect(lineRect, color);
} }
} }
@@ -5109,25 +5106,28 @@ void TextEditorWidgetPrivate::updateCurrentLineHighlight()
// the extra area shows information for the entire current block, not just the currentline. // the extra area shows information for the entire current block, not just the currentline.
// This is why we must force a bigger update region. // This is why we must force a bigger update region.
QList<int> cursorBlockNumbers;
const QPointF offset = q->contentOffset(); const QPointF offset = q->contentOffset();
auto updateBlock = [&](const QTextBlock &block) {
if (block.isValid() && block.isVisible()) {
QRect updateRect = q->blockBoundingGeometry(block).translated(offset).toAlignedRect();
m_extraArea->update(updateRect);
updateRect.setLeft(0);
updateRect.setRight(q->viewport()->width());
q->viewport()->update(updateRect);
}
};
QList<int> cursorBlockNumbers;
for (const QTextCursor &c : m_cursors) { for (const QTextCursor &c : m_cursors) {
int cursorBlockNumber = c.blockNumber(); int cursorBlockNumber = c.blockNumber();
if (!m_cursorBlockNumbers.contains(cursorBlockNumber)) { if (!m_cursorBlockNumbers.contains(cursorBlockNumber))
QTextBlock block = c.block(); updateBlock(c.block());
if (block.isValid() && block.isVisible())
m_extraArea->update(q->blockBoundingGeometry(block).translated(offset).toAlignedRect());
}
if (!cursorBlockNumbers.contains(c.blockNumber())) if (!cursorBlockNumbers.contains(c.blockNumber()))
cursorBlockNumbers << c.blockNumber(); cursorBlockNumbers << c.blockNumber();
} }
if (m_cursorBlockNumbers != cursorBlockNumbers) { if (m_cursorBlockNumbers != cursorBlockNumbers) {
for (int oldBlock : m_cursorBlockNumbers) { for (int oldBlock : m_cursorBlockNumbers) {
if (cursorBlockNumbers.contains(oldBlock)) if (!cursorBlockNumbers.contains(oldBlock))
continue; updateBlock(m_document->document()->findBlockByNumber(oldBlock));
QTextBlock block = m_document->document()->findBlockByNumber(oldBlock);
if (block.isValid() && block.isVisible())
m_extraArea->update(q->blockBoundingGeometry(block).translated(offset).toAlignedRect());
} }
m_cursorBlockNumbers = cursorBlockNumbers; m_cursorBlockNumbers = cursorBlockNumbers;
} }