summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Ehrlicher <[email protected]>2024-11-06 20:02:13 +0100
committerVolker Hilsheimer <[email protected]>2024-11-30 01:51:37 +0000
commitbc80707387195a0b5dbb681da144045644807907 (patch)
treea5a7cfac5af1086cb21e98abf69f58f6e51253ff
parentf1fd15b4549a740dbd0abff44a43b551eef12d31 (diff)
Fusion style: adjust sizeFromContents() for CT_PushButton
Move the text a little bit further away from the horizontal border. [ChangeLog][QtWidgets][Styles] PM_ButtonMargin is now respected for QPushButton in fusion style. Fixes: QTBUG-94860 Change-Id: I2447de0b8fca048eb2efe1a309969fad61f6bd29 Reviewed-by: Volker Hilsheimer <[email protected]>
-rw-r--r--src/widgets/styles/qfusionstyle.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/widgets/styles/qfusionstyle.cpp b/src/widgets/styles/qfusionstyle.cpp
index aa672cca91f..9fec0fa435a 100644
--- a/src/widgets/styles/qfusionstyle.cpp
+++ b/src/widgets/styles/qfusionstyle.cpp
@@ -2916,6 +2916,8 @@ QSize QFusionStyle::sizeFromContents(ContentsType type, const QStyleOption *opti
switch (type) {
case CT_PushButton:
if (const QStyleOptionButton *btn = qstyleoption_cast<const QStyleOptionButton *>(option)) {
+ const int horizontalMargin = pixelMetric(PM_ButtonMargin, btn);
+ newSize += QSize(horizontalMargin, 0);
if (!btn->text.isEmpty() && newSize.width() < 80)
newSize.setWidth(80);
if (!btn->icon.isNull() && btn->iconSize.height() > 16)