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

TextEditor: reduce annotation painting artifacts

Browse Source 
Request an update covering the complete annotation
rectangle if it is not part of the event rectangle
and Correctly calculate the position for the gradients.

Task-number: QTCREATORBUG-18855
Change-Id: I68b61459e6fd94949baebba25f965226f9d5e441
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2017-10-05 10:03:25 +02:00
parent cf624f92bd
commit 5fb310828e
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -396,7 +396,7 @@ public:
bool expanded,
bool active,
bool hovered) const;
void drawLineAnnotation(QPainter &painter, const QTextBlock &block, qreal start);
void drawLineAnnotation(QPainter &painter, const QTextBlock &block, qreal start, const QRect &eventRect);
void toggleBlockVisible(const QTextBlock &block);
QRect foldBox();
@@ -3860,7 +3860,7 @@ QRectF TextEditorWidgetPrivate::getLastLineLineRect(const QTextBlock &block)
}
void TextEditorWidgetPrivate::drawLineAnnotation(
QPainter &painter, const QTextBlock &block, qreal rightMargin)
QPainter &painter, const QTextBlock &block, qreal rightMargin, const QRect &eventRect)
{
if (!m_displaySettings.m_displayAnnotations)
return;
@@ -3907,11 +3907,16 @@ void TextEditorWidgetPrivate::drawLineAnnotation(
break;
// paint annotation
mark->paintAnnotation(painter, &boundingRect, offset, itemOffset / 2);
mark->paintAnnotation(painter, &boundingRect, offset, itemOffset / 2, q->contentOffset());
x = boundingRect.right();
offset = itemOffset / 2;
m_annotationRects[block.blockNumber()].append({boundingRect, mark});
}
QRect updateRect(lineRect.toRect().topRight(), boundingRect.toRect().bottomRight());
updateRect.setLeft(qMax(0, updateRect.left()));
if (!updateRect.isEmpty() && !eventRect.contains(updateRect))
q->viewport()->update(updateRect);
}
void TextEditorWidget::paintEvent(QPaintEvent *e)
@@ -4409,7 +4414,7 @@ void TextEditorWidget::paintEvent(QPaintEvent *e)
&& blockSelectionCursorRect.isValid())
painter.fillRect(blockSelectionCursorRect, palette().text());
d->drawLineAnnotation(painter, block, lineX < viewportRect.width() ? lineX : 0);
d->drawLineAnnotation(painter, block, lineX < viewportRect.width() ? lineX : 0, er);
}
offset.ry() += r.height();