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

use new selection type for find scopes, draw shadow in overlay (not underlay)

Browse Source
This commit is contained in:
mae
2009-12-02 13:24:53 +01:00
parent 75a7abb8c5
commit 54d3d06614
2 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2092,10 +2092,12 @@ void BaseTextEditor::paintEvent(QPaintEvent *e)
QAbstractTextDocumentLayout::PaintContext context = getPaintContext();
if (!d->m_findScope.isNull()) {
QAbstractTextDocumentLayout::Selection selection;
selection.format.setBackground(d->m_searchScopeFormat.background());
selection.cursor = d->m_findScope;
context.selections.prepend(selection);
TextEditorOverlay *overlay = new TextEditorOverlay(this);
overlay->addOverlaySelection(d->m_findScope, d->m_searchScopeFormat.background().color().darker(120),
d->m_searchScopeFormat.background().color());
overlay->paint(&painter, e->rect());
delete overlay;
}
BlockSelectionData *blockSelection = 0;
@@ -2146,6 +2148,7 @@ void BaseTextEditor::paintEvent(QPaintEvent *e)
} // end first pass
d->m_searchResultOverlay->fill(&painter,
d->m_searchResultFormat.background().color(),
e->rect());
@@ -2978,13 +2981,25 @@ void BaseTextEditor::slotUpdateBlockNotify(const QTextBlock &block)
/* an overlay might draw outside the block bounderies, force
complete viewport update */
viewport()->update();
} else if (block.previous().isValid() && block.userState() != block.previous().userState()) {
} else {
if (block.previous().isValid() && block.userState() != block.previous().userState()) {
/* The syntax highlighting state changes. This opens up for
the possibility that the paragraph has braces that support
code folding. In this case, do the save thing and also
update the previous block, which might contain a collapse
box which now is invalid.*/
emit requestBlockUpdate(block.previous());
emit requestBlockUpdate(block.previous());
}
if (!d->m_findScope.isNull()) {
if (block.position() < d->m_findScope.selectionEnd()
&& block.position()+block.length() >= d->m_findScope.selectionStart() ) {
QTextBlock b = block.document()->findBlock(d->m_findScope.selectionStart());
do {
emit requestBlockUpdate(b);
b = b.next();
} while (b.isValid() && b.position() < d->m_findScope.selectionEnd());
}
}
}
blockRecursion = false;
}

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

@@ -308,6 +308,18 @@ void TextEditorOverlay::paintSelection(QPainter *painter,
}
painter->setRenderHint(QPainter::Antialiasing);
if (selection.m_dropShadow) {
painter->save();
painter->translate(m_dropShadowWidth, m_dropShadowWidth);
QPainterPath clip = path;
clip.translate(-m_dropShadowWidth, -m_dropShadowWidth);
painter->setClipPath(clip.intersected(path));
painter->fillPath(path, QColor(0, 0, 0, 100));
painter->restore();
}
pen.setJoinStyle(Qt::RoundJoin);
painter->setPen(pen);
painter->drawPath(path);
@@ -328,11 +340,6 @@ void TextEditorOverlay::fillSelection(QPainter *painter,
painter->save();
painter->translate(-.5, -.5);
painter->setRenderHint(QPainter::Antialiasing);
if (selection.m_dropShadow) {
painter->translate(m_dropShadowWidth, m_dropShadowWidth);
painter->fillPath(path, QColor(0, 0, 0, 100));
painter->translate(-m_dropShadowWidth, -m_dropShadowWidth);
}
painter->fillPath(path, color);
painter->restore();
}