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

QDrawUtil: Cleanup qDrawPlainRoundedRect/qDrawPlainRect

Browse Source 
Cleanup the drawing code to avoid useless drawings by only calling
drawRect once with the correct parameters. This also removes rendering
artifacts due to e.g. rounding errors with a dpr != 1.

Fixes: QTBUG-132187
Pick-to: 6.9 6.8
Change-Id: Ib5eff89c8bdcbd0c86954e78dadaad83346c92ff
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Christian Ehrlicher 2024-12-16 17:03:33 +01:00
parent 98653cca45
commit 611031e4f0
1 changed files with 18 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/widgets/styles/qdrawutil.cpp
View File

@ -540,27 +540,15 @@ void qDrawPlainRect(QPainter *p, int x, int y, int w, int h, const QColor &c,
}
QPainterStateGuard painterGuard(p);
const qreal devicePixelRatio = QStyleHelper::getDpr(p);
if (!qFuzzyCompare(devicePixelRatio, qreal(1))) {
const qreal inverseScale = qreal(1) / devicePixelRatio;
p->scale(inverseScale, inverseScale);
x = qRound(devicePixelRatio * x);
y = qRound(devicePixelRatio * y);
w = devicePixelRatio * w;
h = devicePixelRatio * h;
lineWidth = qRound(devicePixelRatio * lineWidth);
p->translate(0.5, 0.5);
}
p->setPen(c);
p->setBrush(Qt::NoBrush);
for (int i=0; i<lineWidth; i++)
p->drawRect(x+i, y+i, w-i*2 - 1, h-i*2 - 1);
if (fill) { // fill with fill color
p->setPen(Qt::NoPen);
p->setBrush(*fill);
p->drawRect(x+lineWidth, y+lineWidth, w-lineWidth*2, h-lineWidth*2);
}
if (lineWidth == 0 && !fill)
return;
if (lineWidth > 0)
p->setPen(QPen(c, lineWidth, Qt::SolidLine, Qt::SquareCap, Qt::MiterJoin));
p->setBrush(fill ? *fill : Qt::NoBrush);
const QRectF r(x, y, w, h);
const auto lw2 = lineWidth / 2.;
const QRectF rect = r.marginsRemoved(QMarginsF(lw2, lw2, lw2, lw2));
p->drawRect(rect);
}
/*!
@ -603,30 +591,15 @@ void qDrawPlainRoundedRect(QPainter *p, int x, int y, int w, int h,
}
QPainterStateGuard painterGuard(p);
const qreal devicePixelRatio = QStyleHelper::getDpr(p);
if (!qFuzzyCompare(devicePixelRatio, qreal(1))) {
const qreal inverseScale = qreal(1) / devicePixelRatio;
p->scale(inverseScale, inverseScale);
x = qRound(devicePixelRatio * x);
y = qRound(devicePixelRatio * y);
w = devicePixelRatio * w;
h = devicePixelRatio * h;
lineWidth = qRound(devicePixelRatio * lineWidth);
p->translate(0.5, 0.5);
}
p->setPen(c);
p->setBrush(Qt::NoBrush);
for (int i=0; i<lineWidth; i++) {
QRectF rect(x+i, y+i, w-i*2 - 1, h-i*2 - 1);
rect.marginsRemoved(QMarginsF(0.5,0.5,0.5,0.5));
p->drawRoundedRect(rect, rx, ry);
}
if (fill) { // fill with fill color
p->setPen(Qt::NoPen);
p->setBrush(*fill);
p->drawRoundedRect(x+lineWidth, y+lineWidth, w-lineWidth*2, h-lineWidth*2, rx, ry);
}
if (lineWidth == 0 && !fill)
return;
if (lineWidth > 0)
p->setPen(QPen(c, lineWidth));
p->setBrush(fill ? *fill : Qt::NoBrush);
const QRectF r(x, y, w, h);
const auto lw2 = lineWidth / 2.;
const QRectF rect = r.marginsRemoved(QMarginsF(lw2, lw2, lw2, lw2));
p->drawRoundedRect(rect, rx, ry);
}
/*****************************************************************************