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

QWindows11Style: HighDPI aware progressbars

Browse Source 
Draw progressbars and progressbar handles on sub-pixel coordinates to be
HighDPI aware.

Change-Id: Ib4f39c3b3a05d9f47c045dd6032d7544b7add175
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
(cherry picked from commit a1d18276a84f0f72af48c3b899c80d4b9407ef4b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Wladimir Leuschner 2024-02-28 15:51:16 +01:00 committed by Qt Cherry-pick Bot
parent 518ce19c75
commit 0ce2ed6f60
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/styles/modernwindows/qwindows11style.cpp
View File

@ -1194,7 +1194,7 @@ void QWindows11Style::drawControl(ControlElement element, const QStyleOption *op
case QStyle::CE_ProgressBarGroove:{ case QStyle::CE_ProgressBarGroove:{
if (const QStyleOptionProgressBar* progbaropt = qstyleoption_cast<const QStyleOptionProgressBar*>(option)) { if (const QStyleOptionProgressBar* progbaropt = qstyleoption_cast<const QStyleOptionProgressBar*>(option)) {
const QProgressBar* bar = qobject_cast<const QProgressBar*>(widget); const QProgressBar* bar = qobject_cast<const QProgressBar*>(widget);
QRectF rect = subElementRect(SE_ProgressBarContents, progbaropt, widget); QRect rect = subElementRect(SE_ProgressBarContents, progbaropt, widget);
QPointF center = rect.center(); QPointF center = rect.center();
if (bar->orientation() & Qt::Horizontal) { if (bar->orientation() & Qt::Horizontal) {
rect.setHeight(1); rect.setHeight(1);
@ -1205,29 +1205,33 @@ void QWindows11Style::drawControl(ControlElement element, const QStyleOption *op
} }
painter->setPen(Qt::NoPen); painter->setPen(Qt::NoPen);
painter->setBrush(Qt::gray); painter->setBrush(Qt::gray);
painter->drawRoundedRect(rect, secondLevelRoundingRadius, secondLevelRoundingRadius); painter->drawRect(rect);
} }
break; break;
} }
case QStyle::CE_ProgressBarContents: case QStyle::CE_ProgressBarContents:
if (const QStyleOptionProgressBar* progbaropt = qstyleoption_cast<const QStyleOptionProgressBar*>(option)) { if (const QStyleOptionProgressBar* progbaropt = qstyleoption_cast<const QStyleOptionProgressBar*>(option)) {
const QProgressBar* bar = qobject_cast<const QProgressBar*>(widget); const QProgressBar* bar = qobject_cast<const QProgressBar*>(widget);
const qreal progressBarThickness = 3;
const qreal progressBarHalfThickness = progressBarThickness / 2.0;
QRectF rect = subElementRect(SE_ProgressBarContents, progbaropt, widget); QRectF rect = subElementRect(SE_ProgressBarContents, progbaropt, widget);
QRectF originalRect = rect; QRectF originalRect = rect;
QPointF center = rect.center(); QPointF center = rect.center();
bool isIndeterminate = progbaropt->maximum == 0 && progbaropt->minimum == 0; bool isIndeterminate = progbaropt->maximum == 0 && progbaropt->minimum == 0;
float fillPercentage = 0; float fillPercentage = 0;
const qreal offset = (bar->orientation() == Qt::Horizontal && int(rect.height()) % 2 == 0)
|| (bar->orientation() == Qt::Vertical && int(rect.width()) % 2 == 0) ? 0.5 : 0.0;
if (!isIndeterminate) { if (!isIndeterminate) {
fillPercentage = ((float(progbaropt->progress) - float(progbaropt->minimum)) / (float(progbaropt->maximum) - float(progbaropt->minimum))); fillPercentage = ((float(progbaropt->progress) - float(progbaropt->minimum)) / (float(progbaropt->maximum) - float(progbaropt->minimum)));
if (bar->orientation() == Qt::Horizontal) { if (bar->orientation() == Qt::Horizontal) {
rect.setHeight(4); rect.setHeight(progressBarThickness);
rect.moveTop(center.y() - 1.5); rect.moveTop(center.y() - progressBarHalfThickness - offset);
rect.setWidth(rect.width() * fillPercentage); rect.setWidth(rect.width() * fillPercentage);
} else { } else {
float oldHeight = rect.height(); float oldHeight = rect.height();
rect.setWidth(4); rect.setWidth(progressBarThickness);
rect.moveLeft(center.x() - 1.5); rect.moveLeft(center.x() - progressBarHalfThickness - offset);
rect.moveTop(oldHeight * (1.0f - fillPercentage)); rect.moveTop(oldHeight * (1.0f - fillPercentage));
rect.setHeight(oldHeight * fillPercentage); rect.setHeight(oldHeight * fillPercentage);
} }
@ -1238,14 +1242,14 @@ void QWindows11Style::drawControl(ControlElement element, const QStyleOption *op
float barBegin = qMin(qMax(fillPercentage-0.25,0.0) * rect.width(), float(rect.width())); float barBegin = qMin(qMax(fillPercentage-0.25,0.0) * rect.width(), float(rect.width()));
float barEnd = qMin(fillPercentage * rect.width(), float(rect.width())); float barEnd = qMin(fillPercentage * rect.width(), float(rect.width()));
rect = QRect(QPoint(rect.left() + barBegin, rect.top()), QPoint(rect.left() + barEnd, rect.bottom())); rect = QRect(QPoint(rect.left() + barBegin, rect.top()), QPoint(rect.left() + barEnd, rect.bottom()));
rect.setHeight(4); rect.setHeight(progressBarThickness);
rect.moveTop(center.y() - 1.5); rect.moveTop(center.y() - progressBarHalfThickness - offset);
} else { } else {
float barBegin = qMin(qMax(fillPercentage-0.25,0.0) * rect.height(), float(rect.height())); float barBegin = qMin(qMax(fillPercentage-0.25,0.0) * rect.height(), float(rect.height()));
float barEnd = qMin(fillPercentage * rect.height(), float(rect.height())); float barEnd = qMin(fillPercentage * rect.height(), float(rect.height()));
rect = QRect(QPoint(rect.left(), rect.bottom() - barEnd), QPoint(rect.right(), rect.bottom() - barBegin)); rect = QRect(QPoint(rect.left(), rect.bottom() - barEnd), QPoint(rect.right(), rect.bottom() - barBegin));
rect.setWidth(4); rect.setWidth(progressBarThickness);
rect.moveLeft(center.x() - 1.5); rect.moveLeft(center.x() - progressBarHalfThickness - offset);
} }
const_cast<QWidget*>(widget)->update(); const_cast<QWidget*>(widget)->update();
} }