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

9
src/plugins/texteditor/textmark.cpp
View File

@@ -122,7 +122,8 @@ void TextMark::paintIcon(QPainter *painter, const QRect &rect) const
}
void TextMark::paintAnnotation(QPainter &painter, QRectF *annotationRect,
const qreal fadeInOffset, const qreal fadeOutOffset) const
const qreal fadeInOffset, const qreal fadeOutOffset,
const QPointF &contentOffset) const
{
QString text = lineAnnotation();
if (text.isEmpty())
@@ -136,7 +137,8 @@ void TextMark::paintAnnotation(QPainter &painter, QRectF *annotationRect,
markColor, painter.background().color());
painter.save();
QLinearGradient grad(rects.fadeInRect.topLeft(), rects.fadeInRect.topRight());
QLinearGradient grad(rects.fadeInRect.topLeft() - contentOffset,
rects.fadeInRect.topRight() - contentOffset);
grad.setColorAt(0.0, Qt::transparent);
grad.setColorAt(1.0, colors.rectColor);
painter.fillRect(rects.fadeInRect, grad);
@@ -145,7 +147,8 @@ void TextMark::paintAnnotation(QPainter &painter, QRectF *annotationRect,
paintIcon(&painter, rects.iconRect.toAlignedRect());
painter.drawText(rects.textRect, Qt::AlignLeft, rects.text);
if (rects.fadeOutRect.isValid()) {
grad = QLinearGradient(rects.fadeOutRect.topLeft(), rects.fadeOutRect.topRight());
grad = QLinearGradient(rects.fadeOutRect.topLeft() - contentOffset,
rects.fadeOutRect.topRight() - contentOffset);
grad.setColorAt(0.0, colors.rectColor);
grad.setColorAt(1.0, Qt::transparent);
painter.fillRect(rects.fadeOutRect, grad);