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

Merge branch '1.3'

Browse Source 
Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp
This commit is contained in:
Thorbjørn Lindeijer
2010-02-04 15:09:05 +01:00
parent 2ce1603ccf 5268aaed0d
commit 9b3dd396be
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/texteditor/basetexteditor.cpp
View File

@@ -2311,13 +2311,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);
}