1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QTextDocumentLayout: Refactor pagination logic for borders

Browse Source 
The new helper class BorderPaginator encapsulates the existing pagination
logic for drawing correctly clipped borders on all pages a cell appears
on.

This will allow reuse of that logic for drawing CSS-style borders.

Change-Id: I47ed4a8802513aef30d97f14591c7d4716bfdbb8
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
This commit is contained in:
Nils Jeisecke 2015-12-16 17:20:49 +01:00 committed by Nils Jeisecke
parent 81554aca81
commit 4c2587b6bc
1 changed files with 40 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/gui/text/qtextdocumentlayout.cpp
View File

@ -798,12 +798,45 @@ QFixed QTextDocumentLayoutPrivate::blockIndent(const QTextBlockFormat &blockForm
return QFixed::fromReal(indent * scale * document->indentWidth()); return QFixed::fromReal(indent * scale * document->indentWidth());
} }
struct BorderPaginator
{
BorderPaginator(QTextDocument *document, const QRectF &rect, qreal topMarginAfterPageBreak, qreal bottomMargin, qreal border) :
pageHeight(document->pageSize().height()),
topPage(pageHeight > 0 ? static_cast<int>(rect.top() / pageHeight) : 0),
bottomPage(pageHeight > 0 ? static_cast<int>((rect.bottom() + border) / pageHeight) : 0),
rect(rect),
topMarginAfterPageBreak(topMarginAfterPageBreak),
bottomMargin(bottomMargin), border(border)
{}
QRectF clipRect(int page) const
{
QRectF clipped = rect.toRect();
if (topPage != bottomPage) {
clipped.setTop(qMax(clipped.top(), page * pageHeight + topMarginAfterPageBreak - border));
clipped.setBottom(qMin(clipped.bottom(), (page + 1) * pageHeight - bottomMargin));
if (clipped.bottom() <= clipped.top())
return QRectF();
}
return clipped;
}
qreal pageHeight;
int topPage;
int bottomPage;
QRectF rect;
qreal topMarginAfterPageBreak;
qreal bottomMargin;
qreal border;
};
void QTextDocumentLayoutPrivate::drawBorder(QPainter *painter, const QRectF &rect, qreal topMargin, qreal bottomMargin, void QTextDocumentLayoutPrivate::drawBorder(QPainter *painter, const QRectF &rect, qreal topMargin, qreal bottomMargin,
qreal border, const QBrush &brush, QTextFrameFormat::BorderStyle style) const qreal border, const QBrush &brush, QTextFrameFormat::BorderStyle style) const
{ {
const qreal pageHeight = document->pageSize().height(); BorderPaginator paginator(document, rect, topMargin, bottomMargin, border);
const int topPage = pageHeight > 0 ? static_cast<int>(rect.top() / pageHeight) : 0;
const int bottomPage = pageHeight > 0 ? static_cast<int>((rect.bottom() + border) / pageHeight) : 0;
#ifndef QT_NO_CSSPARSER #ifndef QT_NO_CSSPARSER
QCss::BorderStyle cssStyle = static_cast<QCss::BorderStyle>(style + 1); QCss::BorderStyle cssStyle = static_cast<QCss::BorderStyle>(style + 1);
@ -814,16 +847,11 @@ void QTextDocumentLayoutPrivate::drawBorder(QPainter *painter, const QRectF &rec
bool turn_off_antialiasing = !(painter->renderHints() & QPainter::Antialiasing); bool turn_off_antialiasing = !(painter->renderHints() & QPainter::Antialiasing);
painter->setRenderHint(QPainter::Antialiasing); painter->setRenderHint(QPainter::Antialiasing);
for (int i = topPage; i <= bottomPage; ++i) { for (int i = paginator.topPage; i <= paginator.bottomPage; ++i) {
QRectF clipped = rect.toRect(); QRectF clipped = paginator.clipRect(i);
if (!clipped.isValid())
continue;
if (topPage != bottomPage) {
clipped.setTop(qMax(clipped.top(), i * pageHeight + topMargin - border));
clipped.setBottom(qMin(clipped.bottom(), (i + 1) * pageHeight - bottomMargin));
if (clipped.bottom() <= clipped.top())
continue;
}
#ifndef QT_NO_CSSPARSER #ifndef QT_NO_CSSPARSER
qDrawEdge(painter, clipped.left(), clipped.top(), clipped.left() + border, clipped.bottom() + border, 0, 0, QCss::LeftEdge, cssStyle, brush); qDrawEdge(painter, clipped.left(), clipped.top(), clipped.left() + border, clipped.bottom() + border, 0, 0, QCss::LeftEdge, cssStyle, brush);
qDrawEdge(painter, clipped.left() + border, clipped.top(), clipped.right() + border, clipped.top() + border, 0, 0, QCss::TopEdge, cssStyle, brush); qDrawEdge(painter, clipped.left() + border, clipped.top(), clipped.right() + border, clipped.top() + border, 0, 0, QCss::TopEdge, cssStyle, brush);