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

QDrawUtil: Cleanup qDrawPlainRoundedRect/qDrawPlainRect

Browse Source 
Fix the style and use PainterStateGuard instead own save/restore
functionality because PainterStateGuard is already available and used in
those functions.

Task-number: QTBUG-132187
Change-Id: Ie454b6cffe03444d88f13d15adb19a7e7783a493
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 1fb86f1f84bb56dab60bc15604c09a14157d6f10)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit f349040b39f6c560b2ccb17510fd6cc2c49ab6b9)
This commit is contained in:
Christian Ehrlicher 2024-12-16 16:59:32 +01:00
parent 7ce5b4f486
commit 45f39ab5b3
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -572,18 +572,19 @@ void qDrawWinPanel(QPainter *p, int x, int y, int w, int h,
*/
void qDrawPlainRect(QPainter *p, int x, int y, int w, int h, const QColor &c,
int lineWidth, const QBrush *fill)
int lineWidth, const QBrush *fill)
{
if (w == 0 || h == 0)
return;
if (Q_UNLIKELY(w < 0 || h < 0 || lineWidth < 0)) {
qWarning("qDrawPlainRect: Invalid parameters");
return;
}
PainterStateGuard painterGuard(p);
painterGuard.save();
const qreal devicePixelRatio = p->device()->devicePixelRatio();
if (!qFuzzyCompare(devicePixelRatio, qreal(1))) {
painterGuard.save();
const qreal inverseScale = qreal(1) / devicePixelRatio;
p->scale(inverseScale, inverseScale);
x = qRound(devicePixelRatio * x);
@ -594,8 +595,6 @@ void qDrawPlainRect(QPainter *p, int x, int y, int w, int h, const QColor &c,
p->translate(0.5, 0.5);
}
QPen oldPen = p->pen();
QBrush oldBrush = p->brush();
p->setPen(c);
p->setBrush(Qt::NoBrush);
for (int i=0; i<lineWidth; i++)
@ -605,8 +604,6 @@ void qDrawPlainRect(QPainter *p, int x, int y, int w, int h, const QColor &c,
p->setBrush(*fill);
p->drawRect(x+lineWidth, y+lineWidth, w-lineWidth*2, h-lineWidth*2);
}
p->setPen(oldPen);
p->setBrush(oldBrush);
}
/*!
@ -638,19 +635,20 @@ void qDrawPlainRect(QPainter *p, int x, int y, int w, int h, const QColor &c,
// ### Qt7: Pass QPen instead of QColor for frame drawing
void qDrawPlainRoundedRect(QPainter *p, int x, int y, int w, int h,
qreal rx, qreal ry, const QColor &c,
int lineWidth, const QBrush *fill)
qreal rx, qreal ry, const QColor &c,
int lineWidth, const QBrush *fill)
{
if (w == 0 || h == 0)
return;
if (Q_UNLIKELY(w < 0 || h < 0 || lineWidth < 0)) {
qWarning("qDrawPlainRect: Invalid parameters");
return;
}
PainterStateGuard painterGuard(p);
painterGuard.save();
const qreal devicePixelRatio = p->device()->devicePixelRatio();
if (!qFuzzyCompare(devicePixelRatio, qreal(1))) {
painterGuard.save();
const qreal inverseScale = qreal(1) / devicePixelRatio;
p->scale(inverseScale, inverseScale);
x = qRound(devicePixelRatio * x);
@ -661,7 +659,6 @@ void qDrawPlainRoundedRect(QPainter *p, int x, int y, int w, int h,
p->translate(0.5, 0.5);
}
p->save();
p->setPen(c);
p->setBrush(Qt::NoBrush);
for (int i=0; i<lineWidth; i++) {
@ -674,7 +671,6 @@ void qDrawPlainRoundedRect(QPainter *p, int x, int y, int w, int h,
p->setBrush(*fill);
p->drawRoundedRect(x+lineWidth, y+lineWidth, w-lineWidth*2, h-lineWidth*2, rx, ry);
}
p->restore();
}
/*****************************************************************************