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

QCommonStyle: Adjust painting arrows in high-dpi mode

Browse Source 
PE_IndicatorArrowUp/Down/Left/Right was drawn using integer coordinates
for the three edges which lead to artifacts in high-dpi mode. Fix it by
using QPointF instead.

Fixes: QTBUG-114539
Change-Id: I03cbff2ef789e8cee0f3a0d84138d94516340669
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 3936d254ca0e7259cd97238c31df8413d03fd475)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Christian Ehrlicher 2023-11-11 21:14:54 +01:00 committed by Qt Cherry-pick Bot
parent 55e6822bc8
commit 62f32c7e18
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/widgets/styles/qcommonstyle.cpp
View File

@ -741,26 +741,26 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q
% HexString<uint>(pe), % HexString<uint>(pe),
opt, QSize(size, size)); opt, QSize(size, size));
if (!QPixmapCache::find(pixmapName, &pixmap)) { if (!QPixmapCache::find(pixmapName, &pixmap)) {
qreal pixelRatio = p->device()->devicePixelRatio(); const qreal pixelRatio = p->device()->devicePixelRatio();
int border = qRound(pixelRatio*(size/5)); const qreal border = pixelRatio * (size / 5.);
int sqsize = qRound(pixelRatio*(2*(size/2))); const qreal sqsize = pixelRatio * size;
QImage image(sqsize, sqsize, QImage::Format_ARGB32_Premultiplied); QImage image(sqsize, sqsize, QImage::Format_ARGB32_Premultiplied);
image.fill(0); image.fill(Qt::transparent);
QPainter imagePainter(&image); QPainter imagePainter(&image);
QPolygon a; QPolygonF poly;
switch (pe) { switch (pe) {
case PE_IndicatorArrowUp: case PE_IndicatorArrowUp:
a.setPoints(3, border, sqsize/2, sqsize/2, border, sqsize - border, sqsize/2); poly = {QPointF(border, sqsize / 2), QPointF(sqsize / 2, border), QPointF(sqsize - border, sqsize / 2)};
break; break;
case PE_IndicatorArrowDown: case PE_IndicatorArrowDown:
a.setPoints(3, border, sqsize/2, sqsize/2, sqsize - border, sqsize - border, sqsize/2); poly = {QPointF(border, sqsize / 2), QPointF(sqsize / 2, sqsize - border), QPointF(sqsize - border, sqsize / 2)};
break; break;
case PE_IndicatorArrowRight: case PE_IndicatorArrowRight:
a.setPoints(3, sqsize - border, sqsize/2, sqsize/2, border, sqsize/2, sqsize - border); poly = {QPointF(sqsize - border, sqsize / 2), QPointF(sqsize / 2, border), QPointF(sqsize / 2, sqsize - border)};
break; break;
case PE_IndicatorArrowLeft: case PE_IndicatorArrowLeft:
a.setPoints(3, border, sqsize/2, sqsize/2, border, sqsize/2, sqsize - border); poly = {QPointF(border, sqsize / 2), QPointF(sqsize / 2, border), QPointF(sqsize / 2, sqsize - border)};
break; break;
default: default:
break; break;
@ -774,9 +774,9 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q
bsy = proxy()->pixelMetric(PM_ButtonShiftVertical, opt, widget); bsy = proxy()->pixelMetric(PM_ButtonShiftVertical, opt, widget);
} }
QRect bounds = a.boundingRect(); const QRectF bounds = poly.boundingRect();
int sx = sqsize / 2 - bounds.center().x() - 1; const qreal sx = sqsize / 2 - bounds.center().x() - 1;
int sy = sqsize / 2 - bounds.center().y() - 1; const qreal sy = sqsize / 2 - bounds.center().y() - 1;
imagePainter.translate(sx + bsx, sy + bsy); imagePainter.translate(sx + bsx, sy + bsy);
imagePainter.setPen(opt->palette.buttonText().color()); imagePainter.setPen(opt->palette.buttonText().color());
imagePainter.setBrush(opt->palette.buttonText()); imagePainter.setBrush(opt->palette.buttonText());
@ -785,13 +785,13 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q
imagePainter.translate(1, 1); imagePainter.translate(1, 1);
imagePainter.setBrush(opt->palette.light().color()); imagePainter.setBrush(opt->palette.light().color());
imagePainter.setPen(opt->palette.light().color()); imagePainter.setPen(opt->palette.light().color());
imagePainter.drawPolygon(a); imagePainter.drawPolygon(poly);
imagePainter.translate(-1, -1); imagePainter.translate(-1, -1);
imagePainter.setBrush(opt->palette.mid().color()); imagePainter.setBrush(opt->palette.mid().color());
imagePainter.setPen(opt->palette.mid().color()); imagePainter.setPen(opt->palette.mid().color());
} }
imagePainter.drawPolygon(a); imagePainter.drawPolygon(poly);
imagePainter.end(); imagePainter.end();
pixmap = QPixmap::fromImage(image); pixmap = QPixmap::fromImage(image);
pixmap.setDevicePixelRatio(pixelRatio); pixmap.setDevicePixelRatio(pixelRatio);