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

TextEditor: prefilter overlay selections before painting

Browse Source 
This prevents calculating the block bounding rect for blocks outside of
the cliprect.

Change-Id: I4a7311c3f41cab329098f6dfc122d60bd89d215d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2023-06-12 11:02:43 +02:00
parent 8e16822d73
commit f782399789
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/texteditor/texteditoroverlay.cpp
View File

@@ -326,9 +326,18 @@ void TextEditorOverlay::fillSelection(QPainter *painter,
void TextEditorOverlay::paint(QPainter *painter, const QRect &clip)
{
Q_UNUSED(clip)
for (int i = m_selections.size()-1; i >= 0; --i) {
const auto firstBlock = m_editor->blockForVerticalOffset(clip.top());
const auto lastBlock = m_editor->blockForVerticalOffset(clip.bottom());
auto overlapsClip = [&](const OverlaySelection &selection) {
return selection.m_cursor_end.blockNumber() >= firstBlock.blockNumber()
&& selection.m_cursor_begin.blockNumber() <= lastBlock.blockNumber();
};
for (int i = m_selections.size() - 1; i >= 0; --i) {
const OverlaySelection &selection = m_selections.at(i);
if (selection.m_dropShadow)
if (selection.m_dropShadow || !overlapsClip(selection))
continue;
if (selection.m_fixedLength >= 0
&& selection.m_cursor_end.position() - selection.m_cursor_begin.position()
@@ -337,9 +346,9 @@ void TextEditorOverlay::paint(QPainter *painter, const QRect &clip)
paintSelection(painter, selection, clip);
}
for (int i = m_selections.size()-1; i >= 0; --i) {
for (int i = m_selections.size() - 1; i >= 0; --i) {
const OverlaySelection &selection = m_selections.at(i);
if (!selection.m_dropShadow)
if (!selection.m_dropShadow || !overlapsClip(selection))
continue;
if (selection.m_fixedLength >= 0
&& selection.m_cursor_end.position() - selection.m_cursor_begin.position()