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

Editor: Do not use disabled code color for right margin highlight

Browse Source 
Fixes: QTCREATORBUG-17174
Change-Id: I68729d5a44b23fe46b810054a1dc472ffd63e272
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2020-10-20 10:16:33 +02:00
parent 6b8d8e414a
commit 0ca9ea353c
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4175,6 +4175,13 @@ void TextEditorWidgetPrivate::updateLineAnnotation(const PaintEventData &data,
q->viewport()->update(updateRect); q->viewport()->update(updateRect);
} }
QColor blendRightMarginColor(const FontSettings &settings, bool areaColor)
{
const QColor baseColor = settings.toTextCharFormat(C_TEXT).background().color();
const QColor col = (baseColor.value() > 128) ? Qt::black : Qt::white;
return blendColors(baseColor, col, areaColor ? 16 : 32);
}
void TextEditorWidgetPrivate::paintRightMarginArea(PaintEventData &data, QPainter &painter) const void TextEditorWidgetPrivate::paintRightMarginArea(PaintEventData &data, QPainter &painter) const
{ {
if (m_visibleWrapColumn <= 0) if (m_visibleWrapColumn <= 0)
@@ -4189,7 +4196,7 @@ void TextEditorWidgetPrivate::paintRightMarginArea(PaintEventData &data, QPainte
data.eventRect.top(), data.eventRect.top(),
data.viewportRect.width() - data.rightMargin, data.viewportRect.width() - data.rightMargin,
data.eventRect.height()); data.eventRect.height());
painter.fillRect(behindMargin, data.ifdefedOutFormat.background()); painter.fillRect(behindMargin, blendRightMarginColor(m_document->fontSettings(), true));
} }
} }
@@ -4199,11 +4206,8 @@ void TextEditorWidgetPrivate::paintRightMarginLine(const PaintEventData &data,
if (m_visibleWrapColumn <= 0 || data.rightMargin >= data.viewportRect.width()) if (m_visibleWrapColumn <= 0 || data.rightMargin >= data.viewportRect.width())
return; return;
const QBrush background = data.ifdefedOutFormat.background();
const QColor baseColor = m_document->fontSettings().toTextCharFormat(C_TEXT).background().color();
const QColor col = (baseColor.value() > 128) ? Qt::black : Qt::white;
const QPen pen = painter.pen(); const QPen pen = painter.pen();
painter.setPen(blendColors(background.isOpaque() ? background.color() : baseColor, col, 32)); painter.setPen(blendRightMarginColor(m_document->fontSettings(), false));
painter.drawLine(QPointF(data.rightMargin, data.eventRect.top()), painter.drawLine(QPointF(data.rightMargin, data.eventRect.top()),
QPointF(data.rightMargin, data.eventRect.bottom())); QPointF(data.rightMargin, data.eventRect.bottom()));
painter.setPen(pen); painter.setPen(pen);