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

Make dockwidget title bar buttons show again

Browse Source 
Amends f61304fc77a622170ef3bbcbcb37c5a90c6f87ea, which renamed the files
but didn't adjust the code.

Task-number: QTBUG-38776
Change-Id: If54dd986975dd28f147a98628317b1369d0c690f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 22571c21c9be10d9ada756c598f519f74273579a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Volker Hilsheimer 2021-06-14 14:28:30 +02:00 committed by Qt Cherry-pick Bot
parent a6a2c56c96
commit 4b4cf09f29
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6092,11 +6092,13 @@ QIcon QCommonStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption
case SP_TitleBarCloseButton: {
QIcon titleBarIcon;
if (standardIcon == SP_TitleBarCloseButton) {
titleBarIcon.addFile(QLatin1String(":/qt-project.org/styles/macstyle/images/closedock-16.png"));
titleBarIcon.addFile(QLatin1String(":/qt-project.org/styles/macstyle/images/closedock-down-16.png"), QSize(16, 16), QIcon::Normal, QIcon::On);
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(QLatin1String(":/qt-project.org/styles/macstyle/images/dockdock-16.png"));
titleBarIcon.addFile(QLatin1String(":/qt-project.org/styles/macstyle/images/dockdock-down-16.png"), QSize(16, 16), QIcon::Normal, QIcon::On);
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);
}
return titleBarIcon;
}