From 550e511ec8a1aa12ac75ebd71079511572840065 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Fri, 18 Jun 2021 10:58:27 +0200 Subject: Add high-resolution pixmaps for macOS dock widget title icons The macOS style falls back to the QCommonStyle for those, and that style loads the macstyle pixmaps. Weird, but cleaning that up is for another commit. Fixes: QTBUG-38776 Pick-to: 6.1 6.2 5.15 Change-Id: Ie1fe721387e64cb91ee5fc528667a63e6ddd6eed Reviewed-by: Friedemann Kleint --- src/widgets/styles/qcommonstyle.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/widgets/styles/qcommonstyle.cpp') diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index c89c6b789a..9d09fbe2b5 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -6094,14 +6094,14 @@ QIcon QCommonStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption case SP_TitleBarNormalButton: case SP_TitleBarCloseButton: { QIcon titleBarIcon; - if (standardIcon == SP_TitleBarCloseButton) { - titleBarIcon.addFile(QStringLiteral(":/qt-project.org/styles/macstyle/images/closedock-macstyle-16.png")); - titleBarIcon.addFile(QStringLiteral(":/qt-project.org/styles/macstyle/images/closedock-down-macstyle-16.png"), - QSize(16, 16), QIcon::Normal, QIcon::On); - } else { - titleBarIcon.addFile(QStringLiteral(":/qt-project.org/styles/macstyle/images/dockdock-macstyle-16.png")); - titleBarIcon.addFile(QStringLiteral(":/qt-project.org/styles/macstyle/images/dockdock-down-macstyle-16.png"), - QSize(16, 16), QIcon::Normal, QIcon::On); + QString prefix = standardIcon == SP_TitleBarCloseButton + ? QStringLiteral(":/qt-project.org/styles/macstyle/images/closedock-") + : QStringLiteral(":/qt-project.org/styles/macstyle/images/dockdock-"); + for (const auto size : dockTitleIconSizes) { + titleBarIcon.addFile(prefix + QStringLiteral("macstyle-") + QString::number(size) + iconPngSuffix(), + QSize(size, size), QIcon::Normal, QIcon::Off); + titleBarIcon.addFile(prefix + QStringLiteral("down-macstyle-") + QString::number(size) + iconPngSuffix(), + QSize(size, size), QIcon::Normal, QIcon::On); } return titleBarIcon; } -- cgit v1.2.3