Commit e25b457b authored by Thorbjørn Lindeijer's avatar Thorbjørn Lindeijer
Browse files

Avoid drawing a black rectangle due to invalid background for disabled code

Regression in commit ab3d3cf4

Reviewed-by: default avatarDaniel Molkentin <daniel.molkentin@nokia.com>
parent 939b4d89
......@@ -1999,13 +1999,13 @@ void BaseTextEditor::paintEvent(QPaintEvent *e)
lineX = fontMetrics().averageCharWidth() * d->m_visibleWrapColumn + offset.x() + 4;
if (lineX < viewportRect.width()) {
const QColor backgroundColor = d->m_ifdefedOutFormat.background().color();
const QBrush background = d->m_ifdefedOutFormat.background();
painter.fillRect(QRectF(lineX, er.top(), viewportRect.width() - lineX, er.height()),
backgroundColor);
background);
const QColor col = (palette().base().color().value() > 128) ? Qt::black : Qt::white;
const QPen pen = painter.pen();
painter.setPen(blendColors(backgroundColor, col, 32));
painter.setPen(blendColors(background.color(), col, 32));
painter.drawLine(QPointF(lineX, er.top()), QPointF(lineX, er.bottom()));
painter.setPen(pen);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment