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

TextEditor: Simplified "Collapse" rectangle

Browse Source 
The original implementation had several issues with HighDPI.
Also, the gradient looked a bit dated in the now flatter UI.

Let's just fill a rectangle.

Change-Id: I80c3d5f1f8be89e81ea07113a691e69b01ec6272
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
Alessandro Portale
2016-06-09 16:52:00 +02:00
committed by Alessandro Portale
parent d88e75ea9a
commit bc5071df93
1 changed files with 4 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4389,31 +4389,11 @@ void TextEditorWidgetPrivate::slotUpdateExtraAreaWidth()
q->setViewportMargins(0, 0, q->extraAreaWidth(), 0);
}
static void drawRectBox(QPainter *painter, const QRect &rect, bool start, bool end,
const QPalette &pal)
static void drawRectBox(QPainter *painter, const QRect &rect, const QPalette &pal)
{
painter->save();
painter->setRenderHint(QPainter::Antialiasing, false);
QRgb b = pal.base().color().rgb();
QRgb h = pal.highlight().color().rgb();
QColor c = StyleHelper::mergedColors(b,h, 50);
QLinearGradient grad(rect.topLeft(), rect.topRight());
grad.setColorAt(0, c.lighter(110));
grad.setColorAt(1, c.lighter(130));
QColor outline = c;
painter->fillRect(rect, grad);
painter->setPen(outline);
if (start)
painter->drawLine(rect.topLeft() + QPoint(1, 0), rect.topRight() - QPoint(1, 0));
if (end)
painter->drawLine(rect.bottomLeft() + QPoint(1, 0), rect.bottomRight() - QPoint(1, 0));
painter->drawLine(rect.topRight() + QPoint(0, start ? 1 : 0), rect.bottomRight() - QPoint(0, end ? 1 : 0));
painter->drawLine(rect.topLeft() + QPoint(0, start ? 1 : 0), rect.bottomLeft() - QPoint(0, end ? 1 : 0));
painter->setOpacity(0.5);
painter->fillRect(rect, pal.brush(QPalette::Highlight));
painter->restore();
}
@@ -4554,9 +4534,6 @@ void TextEditorWidget::extraAreaPaintEvent(QPaintEvent *e)
bool active = blockNumber == extraAreaHighlightFoldBlockNumber;
bool drawStart = active;
bool drawEnd = blockNumber == extraAreaHighlightFoldEndBlockNumber || (drawStart && !endIsVisible);
bool hovered = blockNumber >= extraAreaHighlightFoldBlockNumber
&& blockNumber <= extraAreaHighlightFoldEndBlockNumber;
@@ -4565,7 +4542,7 @@ void TextEditorWidget::extraAreaPaintEvent(QPaintEvent *e)
int itop = qRound(top);
int ibottom = qRound(bottom);
QRect box = QRect(extraAreaWidth + 1, itop, boxWidth - 2, ibottom - itop);
drawRectBox(&painter, box, drawStart, drawEnd, pal);
drawRectBox(&painter, box, pal);
}
if (drawBox) {