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

improved search result selection with over and underlay

Browse Source 
done with thorbjorn
This commit is contained in:
mae
2009-12-01 14:47:10 +01:00
parent c4737c1fdf
commit e2a899e354
5 changed files with 195 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

155
src/plugins/texteditor/texteditoroverlay.cpp
View File

@@ -36,7 +36,8 @@ void TextEditorOverlay::clear()
update();
}
void TextEditorOverlay::addOverlaySelection(int begin, int end, const QColor &color, bool lockSize)
void TextEditorOverlay::addOverlaySelection(int begin, int end,
const QColor &fg, const QColor &bg, bool lockSize)
{
if (end < begin)
return;
@@ -44,7 +45,8 @@ void TextEditorOverlay::addOverlaySelection(int begin, int end, const QColor &co
QTextDocument *document = m_editor->document();
OverlaySelection selection;
selection.m_color = color;
selection.m_fg = fg;
selection.m_bg = bg;
selection.m_cursor_begin = QTextCursor(document);
selection.m_cursor_begin.setPosition(begin);
@@ -60,9 +62,10 @@ void TextEditorOverlay::addOverlaySelection(int begin, int end, const QColor &co
}
void TextEditorOverlay::addOverlaySelection(const QTextCursor &cursor, const QColor &color, bool lockSize)
void TextEditorOverlay::addOverlaySelection(const QTextCursor &cursor,
const QColor &fg, const QColor &bg, bool lockSize)
{
addOverlaySelection(cursor.selectionStart(), cursor.selectionEnd(), color, lockSize);
addOverlaySelection(cursor.selectionStart(), cursor.selectionEnd(), fg, bg, lockSize);
}
QRect TextEditorOverlay::rect() const
@@ -70,20 +73,21 @@ QRect TextEditorOverlay::rect() const
return m_viewport->rect();
}
void TextEditorOverlay::paintSelection(QPainter *painter, const QTextCursor &begin, const QTextCursor &end, const QColor &color)
QPainterPath TextEditorOverlay::createSelectionPath(const QTextCursor &begin, const QTextCursor &end,
const QRect &clip)
{
if (begin.isNull() || end.isNull() || begin.position() > end.position())
return;
return QPainterPath();
QPointF offset = m_editor->contentOffset();
QRect viewportRect = rect();
QTextDocument *document = m_editor->document();
if (m_editor->blockBoundingGeometry(begin.block()).translated(offset).top() > viewportRect.bottom() + 10
|| m_editor->blockBoundingGeometry(end.block()).translated(offset).bottom() < viewportRect.top() - 10
if (m_editor->blockBoundingGeometry(begin.block()).translated(offset).top() > clip.bottom() + 10
|| m_editor->blockBoundingGeometry(end.block()).translated(offset).bottom() < clip.top() - 10
)
return; // nothing of the selection is visible
return QPainterPath(); // nothing of the selection is visible
QTextBlock block = begin.block();
@@ -154,7 +158,7 @@ void TextEditorOverlay::paintSelection(QPainter *painter, const QTextCursor &beg
if (selection.isEmpty())
return;
return QPainterPath();
QVector<QPointF> points;
@@ -224,34 +228,60 @@ void TextEditorOverlay::paintSelection(QPainter *painter, const QTextCursor &beg
previous = points.at(i);
}
path.closeSubpath();
path.translate(offset);
return path;
}
void TextEditorOverlay::paintSelection(QPainter *painter, const QTextCursor &begin, const QTextCursor &end,
const QColor &fg, const QColor &bg)
{
if (begin.isNull() || end.isNull() || begin.position() > end.position())
return;
QPainterPath path = createSelectionPath(begin, end, m_editor->viewport()->rect());
painter->save();
QColor penColor = color;
QColor penColor = fg;
penColor.setAlpha(220);
QPen pen(penColor, m_borderWidth);
painter->translate(-.5, -.5);
path.translate(offset);
QRectF pathRect = path.controlPointRect();
QLinearGradient linearGrad(pathRect.topLeft(), pathRect.bottomLeft());
QColor col1 = color.lighter(150);
col1.setAlpha(20);
QColor col2 = color;
col2.setAlpha(80);
linearGrad.setColorAt(0, col1);
linearGrad.setColorAt(1, col2);
QBrush brush(linearGrad);
if (bg.isValid()) {
QLinearGradient linearGrad(pathRect.topLeft(), pathRect.bottomLeft());
QColor col1 = fg.lighter(150);
col1.setAlpha(20);
QColor col2 = fg;
col2.setAlpha(80);
linearGrad.setColorAt(0, col1);
linearGrad.setColorAt(1, col2);
painter->setBrush(QBrush(linearGrad));
} else {
painter->setBrush(QBrush());
}
painter->setRenderHint(QPainter::Antialiasing);
pen.setJoinStyle(Qt::RoundJoin);
painter->setPen(pen);
painter->setBrush(brush);
painter->drawPath(path);
painter->restore();
}
void TextEditorOverlay::fillSelection(QPainter *painter, const QTextCursor &begin, const QTextCursor &end,
const QColor &color)
{
if (begin.isNull() || end.isNull() || begin.position() > end.position())
return;
QPainterPath path = createSelectionPath(begin, end, m_editor->viewport()->rect());
painter->save();
painter->translate(-.5, -.5);
painter->setRenderHint(QPainter::Antialiasing);
painter->fillPath(path, color);
painter->restore();
}
void TextEditorOverlay::paint(QPainter *painter, const QRect &clip)
{
@@ -266,10 +296,89 @@ void TextEditorOverlay::paint(QPainter *painter, const QRect &clip)
paintSelection(painter,
selection.m_cursor_begin,
selection.m_cursor_end,
selection.m_color
selection.m_fg,
selection.m_bg
);
}
}
void TextEditorOverlay::fill(QPainter *painter, const QColor &color, const QRect &clip)
{
Q_UNUSED(clip);
for (int i = 0; i < m_selections.size(); ++i) {
const OverlaySelection &selection = m_selections.at(i);
if (selection.m_fixedLength >= 0
&& selection.m_cursor_end.position() - selection.m_cursor_begin.position()
!= selection.m_fixedLength)
continue;
fillSelection(painter,
selection.m_cursor_begin,
selection.m_cursor_end,
color
);
}
}
void TextEditorOverlay::paintInverted(QPainter *painter, const QRect &clip, const QColor &color)
{
QPainterPath path;
for (int i = 0; i < m_selections.size(); ++i) {
const OverlaySelection &selection = m_selections.at(i);
if (selection.m_fixedLength >= 0
&& selection.m_cursor_end.position() - selection.m_cursor_begin.position()
!= selection.m_fixedLength)
continue;
path.addPath(createSelectionPath(selection.m_cursor_begin, selection.m_cursor_end, clip));
}
QRect viewportRect = m_editor->viewport()->rect();
QColor background = Qt::black;
background.setAlpha(30);
if (path.isEmpty()) {
painter->fillRect(viewportRect, background);
return;
}
// QPainterPath all;
// all.addRect(viewportRect);
// QPainterPath inversion = all.subtracted(path);
painter->save();
QColor penColor = color;
penColor.setAlpha(220);
QPen pen(penColor, m_borderWidth);
QColor brush = color;
brush.setAlpha(30);
painter->translate(-.5, -.5);
// painter->setRenderHint(QPainter::Antialiasing);
//pen.setJoinStyle(Qt::RoundJoin);
painter->setPen(pen);
painter->setBrush(QBrush());
painter->drawPath(path);
painter->translate(.5, .5);
QPixmap shadow(clip.size());
shadow.fill(background);
QPainter pmp(&shadow);
pmp.translate(-.5, -.5);
pmp.setRenderHint(QPainter::Antialiasing);
pmp.setCompositionMode(QPainter::CompositionMode_Source);
path.translate(-clip.topLeft());
pen.setColor(Qt::transparent);
pmp.setPen(pen);
pmp.setBrush(Qt::transparent);
pmp.drawPath(path);
pmp.end();
painter->drawPixmap(clip.topLeft(), shadow);
// painter->fillPath(inversion, background);
painter->restore();
}