diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-12-12 09:44:13 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-12-12 09:44:13 +0100 |
| commit | 9084ca73dff77d3df8ce564a19016dfeb482ea6d (patch) | |
| tree | d2adbbe2b307fd51c9dd347cc5cd4be7f9fe9203 /src/plugins/texteditor/texteditor.cpp | |
| parent | 1a2a278eec7a8438006246f47932d614804e3894 (diff) | |
| parent | 5cd4a73acab1ee3782747d5de55c0ae734bfba2f (diff) | |
| download | qt-creator-9084ca73dff77d3df8ce564a19016dfeb482ea6d.tar.gz | |
Merge remote-tracking branch 'origin/4.8'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
src/plugins/cpptools/compileroptionsbuilder.cpp
Change-Id: I87f47cecbb924064296a002fd9446a0627acad8e
Diffstat (limited to 'src/plugins/texteditor/texteditor.cpp')
| -rw-r--r-- | src/plugins/texteditor/texteditor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp index 06913efd0f..7f1c63e2f7 100644 --- a/src/plugins/texteditor/texteditor.cpp +++ b/src/plugins/texteditor/texteditor.cpp @@ -4111,12 +4111,12 @@ void TextEditorWidgetPrivate::updateLineAnnotation(const PaintEventData &data, if (!blockUserData) return; - TextMarks marks = blockUserData->marks(); - - const bool annotationsVisible = Utils::anyOf(marks, [](const TextMark* mark) { + TextMarks marks = Utils::filtered(blockUserData->marks(), [](const TextMark* mark){ return !mark->lineAnnotation().isEmpty(); }); + const bool annotationsVisible = !marks.isEmpty(); + if (updateAnnotationBounds(blockUserData, data.documentLayout, annotationsVisible) || !annotationsVisible) { return; |