From 66c2f31ec950653e144ae76454775614b5391b81 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 Change-Id: Ie1fe721387e64cb91ee5fc528667a63e6ddd6eed Reviewed-by: Friedemann Kleint (cherry picked from commit 550e511ec8a1aa12ac75ebd71079511572840065) Reviewed-by: Qt Cherry-pick Bot --- src/widgets/CMakeLists.txt | 20 ++++++++++++++++++++ .../styles/images/closedock-down-macstyle-10.png | Bin 0 -> 195 bytes .../styles/images/closedock-down-macstyle-20.png | Bin 0 -> 344 bytes .../styles/images/closedock-down-macstyle-32.png | Bin 0 -> 474 bytes .../styles/images/closedock-down-macstyle-48.png | Bin 0 -> 721 bytes .../styles/images/closedock-down-macstyle-64.png | Bin 0 -> 920 bytes src/widgets/styles/images/closedock-macstyle-10.png | Bin 0 -> 309 bytes src/widgets/styles/images/closedock-macstyle-20.png | Bin 0 -> 579 bytes src/widgets/styles/images/closedock-macstyle-32.png | Bin 0 -> 938 bytes src/widgets/styles/images/closedock-macstyle-48.png | Bin 0 -> 1236 bytes src/widgets/styles/images/closedock-macstyle-64.png | Bin 0 -> 1495 bytes .../styles/images/dockdock-down-macstyle-10.png | Bin 0 -> 246 bytes .../styles/images/dockdock-down-macstyle-20.png | Bin 0 -> 363 bytes .../styles/images/dockdock-down-macstyle-32.png | Bin 0 -> 416 bytes .../styles/images/dockdock-down-macstyle-48.png | Bin 0 -> 622 bytes .../styles/images/dockdock-down-macstyle-64.png | Bin 0 -> 771 bytes src/widgets/styles/images/dockdock-macstyle-10.png | Bin 0 -> 339 bytes src/widgets/styles/images/dockdock-macstyle-20.png | Bin 0 -> 555 bytes src/widgets/styles/images/dockdock-macstyle-32.png | Bin 0 -> 654 bytes src/widgets/styles/images/dockdock-macstyle-48.png | Bin 0 -> 915 bytes src/widgets/styles/images/dockdock-macstyle-64.png | Bin 0 -> 1212 bytes src/widgets/styles/qcommonstyle.cpp | 16 ++++++++-------- 22 files changed, 28 insertions(+), 8 deletions(-) create mode 100644 src/widgets/styles/images/closedock-down-macstyle-10.png create mode 100644 src/widgets/styles/images/closedock-down-macstyle-20.png create mode 100644 src/widgets/styles/images/closedock-down-macstyle-32.png create mode 100644 src/widgets/styles/images/closedock-down-macstyle-48.png create mode 100644 src/widgets/styles/images/closedock-down-macstyle-64.png create mode 100644 src/widgets/styles/images/closedock-macstyle-10.png create mode 100644 src/widgets/styles/images/closedock-macstyle-20.png create mode 100644 src/widgets/styles/images/closedock-macstyle-32.png create mode 100644 src/widgets/styles/images/closedock-macstyle-48.png create mode 100644 src/widgets/styles/images/closedock-macstyle-64.png create mode 100644 src/widgets/styles/images/dockdock-down-macstyle-10.png create mode 100644 src/widgets/styles/images/dockdock-down-macstyle-20.png create mode 100644 src/widgets/styles/images/dockdock-down-macstyle-32.png create mode 100644 src/widgets/styles/images/dockdock-down-macstyle-48.png create mode 100644 src/widgets/styles/images/dockdock-down-macstyle-64.png create mode 100644 src/widgets/styles/images/dockdock-macstyle-10.png create mode 100644 src/widgets/styles/images/dockdock-macstyle-20.png create mode 100644 src/widgets/styles/images/dockdock-macstyle-32.png create mode 100644 src/widgets/styles/images/dockdock-macstyle-48.png create mode 100644 src/widgets/styles/images/dockdock-macstyle-64.png (limited to 'src') diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index 683b3e742e..4caa42c4cd 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -248,10 +248,30 @@ qt_internal_add_resource(Widgets "qstyle" ${qstyle_resource_files} ) set(qstyle1_resource_files + "styles/images/closedock-down-macstyle-10.png" "styles/images/closedock-down-macstyle-16.png" + "styles/images/closedock-down-macstyle-20.png" + "styles/images/closedock-down-macstyle-32.png" + "styles/images/closedock-down-macstyle-48.png" + "styles/images/closedock-down-macstyle-64.png" + "styles/images/closedock-macstyle-10.png" "styles/images/closedock-macstyle-16.png" + "styles/images/closedock-macstyle-20.png" + "styles/images/closedock-macstyle-32.png" + "styles/images/closedock-macstyle-48.png" + "styles/images/closedock-macstyle-64.png" + "styles/images/dockdock-down-macstyle-10.png" "styles/images/dockdock-down-macstyle-16.png" + "styles/images/dockdock-down-macstyle-20.png" + "styles/images/dockdock-down-macstyle-32.png" + "styles/images/dockdock-down-macstyle-48.png" + "styles/images/dockdock-down-macstyle-64.png" + "styles/images/dockdock-macstyle-10.png" "styles/images/dockdock-macstyle-16.png" + "styles/images/dockdock-macstyle-20.png" + "styles/images/dockdock-macstyle-32.png" + "styles/images/dockdock-macstyle-48.png" + "styles/images/dockdock-macstyle-64.png" "styles/images/toolbar-ext-macstyle.png" "styles/images/toolbar-ext-macstyle@2x.png" ) diff --git a/src/widgets/styles/images/closedock-down-macstyle-10.png b/src/widgets/styles/images/closedock-down-macstyle-10.png new file mode 100644 index 0000000000..45862f93ff Binary files /dev/null and b/src/widgets/styles/images/closedock-down-macstyle-10.png differ diff --git a/src/widgets/styles/images/closedock-down-macstyle-20.png b/src/widgets/styles/images/closedock-down-macstyle-20.png new file mode 100644 index 0000000000..9112f6968f Binary files /dev/null and b/src/widgets/styles/images/closedock-down-macstyle-20.png differ diff --git a/src/widgets/styles/images/closedock-down-macstyle-32.png b/src/widgets/styles/images/closedock-down-macstyle-32.png new file mode 100644 index 0000000000..ec91d61c1c Binary files /dev/null and b/src/widgets/styles/images/closedock-down-macstyle-32.png differ diff --git a/src/widgets/styles/images/closedock-down-macstyle-48.png b/src/widgets/styles/images/closedock-down-macstyle-48.png new file mode 100644 index 0000000000..dee933d8b3 Binary files /dev/null and b/src/widgets/styles/images/closedock-down-macstyle-48.png differ diff --git a/src/widgets/styles/images/closedock-down-macstyle-64.png b/src/widgets/styles/images/closedock-down-macstyle-64.png new file mode 100644 index 0000000000..134e9c5a1f Binary files /dev/null and b/src/widgets/styles/images/closedock-down-macstyle-64.png differ diff --git a/src/widgets/styles/images/closedock-macstyle-10.png b/src/widgets/styles/images/closedock-macstyle-10.png new file mode 100644 index 0000000000..3746c7af00 Binary files /dev/null and b/src/widgets/styles/images/closedock-macstyle-10.png differ diff --git a/src/widgets/styles/images/closedock-macstyle-20.png b/src/widgets/styles/images/closedock-macstyle-20.png new file mode 100644 index 0000000000..78cc630ea1 Binary files /dev/null and b/src/widgets/styles/images/closedock-macstyle-20.png differ diff --git a/src/widgets/styles/images/closedock-macstyle-32.png b/src/widgets/styles/images/closedock-macstyle-32.png new file mode 100644 index 0000000000..564efe187b Binary files /dev/null and b/src/widgets/styles/images/closedock-macstyle-32.png differ diff --git a/src/widgets/styles/images/closedock-macstyle-48.png b/src/widgets/styles/images/closedock-macstyle-48.png new file mode 100644 index 0000000000..7c9f1b8960 Binary files /dev/null and b/src/widgets/styles/images/closedock-macstyle-48.png differ diff --git a/src/widgets/styles/images/closedock-macstyle-64.png b/src/widgets/styles/images/closedock-macstyle-64.png new file mode 100644 index 0000000000..399548d014 Binary files /dev/null and b/src/widgets/styles/images/closedock-macstyle-64.png differ diff --git a/src/widgets/styles/images/dockdock-down-macstyle-10.png b/src/widgets/styles/images/dockdock-down-macstyle-10.png new file mode 100644 index 0000000000..44215cadec Binary files /dev/null and b/src/widgets/styles/images/dockdock-down-macstyle-10.png differ diff --git a/src/widgets/styles/images/dockdock-down-macstyle-20.png b/src/widgets/styles/images/dockdock-down-macstyle-20.png new file mode 100644 index 0000000000..265da15789 Binary files /dev/null and b/src/widgets/styles/images/dockdock-down-macstyle-20.png differ diff --git a/src/widgets/styles/images/dockdock-down-macstyle-32.png b/src/widgets/styles/images/dockdock-down-macstyle-32.png new file mode 100644 index 0000000000..394e90dcd3 Binary files /dev/null and b/src/widgets/styles/images/dockdock-down-macstyle-32.png differ diff --git a/src/widgets/styles/images/dockdock-down-macstyle-48.png b/src/widgets/styles/images/dockdock-down-macstyle-48.png new file mode 100644 index 0000000000..34c1640597 Binary files /dev/null and b/src/widgets/styles/images/dockdock-down-macstyle-48.png differ diff --git a/src/widgets/styles/images/dockdock-down-macstyle-64.png b/src/widgets/styles/images/dockdock-down-macstyle-64.png new file mode 100644 index 0000000000..12435d8c73 Binary files /dev/null and b/src/widgets/styles/images/dockdock-down-macstyle-64.png differ diff --git a/src/widgets/styles/images/dockdock-macstyle-10.png b/src/widgets/styles/images/dockdock-macstyle-10.png new file mode 100644 index 0000000000..e4d9d147ca Binary files /dev/null and b/src/widgets/styles/images/dockdock-macstyle-10.png differ diff --git a/src/widgets/styles/images/dockdock-macstyle-20.png b/src/widgets/styles/images/dockdock-macstyle-20.png new file mode 100644 index 0000000000..3e9233dc82 Binary files /dev/null and b/src/widgets/styles/images/dockdock-macstyle-20.png differ diff --git a/src/widgets/styles/images/dockdock-macstyle-32.png b/src/widgets/styles/images/dockdock-macstyle-32.png new file mode 100644 index 0000000000..5639a73e94 Binary files /dev/null and b/src/widgets/styles/images/dockdock-macstyle-32.png differ diff --git a/src/widgets/styles/images/dockdock-macstyle-48.png b/src/widgets/styles/images/dockdock-macstyle-48.png new file mode 100644 index 0000000000..fd8c91b094 Binary files /dev/null and b/src/widgets/styles/images/dockdock-macstyle-48.png differ diff --git a/src/widgets/styles/images/dockdock-macstyle-64.png b/src/widgets/styles/images/dockdock-macstyle-64.png new file mode 100644 index 0000000000..43dc7ed091 Binary files /dev/null and b/src/widgets/styles/images/dockdock-macstyle-64.png differ diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index b141f7abea..7192f54a55 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -6091,14 +6091,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