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

TextEditor: fix painting annotations

Browse Source 
The painting of annotations for one line will be aborted as soon as we
hit the first text mark that returns an empty bounding rect for the
annotation. This results in no painting at all when having a line with
multiple text marks with and without annotation. Prefilter the text
marks to make sure we only try to paint text marks with an annotation.

Change-Id: I4f07127fafe935b2ad4ed418b326b6f2ab5b1c50
Fixes: QTCREATORBUG-21628
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2018-12-04 09:56:59 +01:00
parent 3a4a53ee1c
commit 318b83587f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4106,12 +4106,12 @@ void TextEditorWidgetPrivate::updateLineAnnotation(const PaintEventData &data,
if (!blockUserData) if (!blockUserData)
return; return;
TextMarks marks = blockUserData->marks(); TextMarks marks = Utils::filtered(blockUserData->marks(), [](const TextMark* mark){
const bool annotationsVisible = Utils::anyOf(marks, [](const TextMark* mark) {
return !mark->lineAnnotation().isEmpty(); return !mark->lineAnnotation().isEmpty();
}); });
const bool annotationsVisible = !marks.isEmpty();
if (updateAnnotationBounds(blockUserData, data.documentLayout, annotationsVisible) if (updateAnnotationBounds(blockUserData, data.documentLayout, annotationsVisible)
|| !annotationsVisible) { || !annotationsVisible) {
return; return;