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

QStyle: cleanup iconFromApplicationTheme()

Browse Source 
Cleanup iconFromApplicationTheme() by merging the code paths for
SP_DirLinkIcon and SP_FileLinkIcon.

Change-Id: If4c8c850516971a80dffcc59cff7cabdace94585
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
This commit is contained in:
Christian Ehrlicher 2023-10-31 19:29:03 +01:00
parent fea9109b3b
commit 4a32f8b806
1 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5751,11 +5751,13 @@ QIcon QCommonStylePrivate::iconFromApplicationTheme(QCommonStyle::StandardPixmap
return iconFromApplicationTheme(rtl(option) ? QStyle::SP_ArrowRight return iconFromApplicationTheme(rtl(option) ? QStyle::SP_ArrowRight
: QStyle::SP_ArrowLeft, : QStyle::SP_ArrowLeft,
option, widget); option, widget);
case QStyle::SP_DirLinkIcon:
case QStyle::SP_FileLinkIcon: { case QStyle::SP_FileLinkIcon: {
const auto si = (standardIcon == QStyle::SP_DirLinkIcon)
? QStyle::SP_DirIcon : QStyle::SP_FileIcon;
QIcon icon; QIcon icon;
const QIcon linkIcon = QIcon::fromTheme("emblem-symbolic-link"_L1); const QIcon linkIcon = QIcon::fromTheme("emblem-symbolic-link"_L1);
const QIcon baseIcon = iconFromApplicationTheme(QStyle::SP_FileIcon, const QIcon baseIcon = iconFromApplicationTheme(si, option, widget);
option, widget);
if (!linkIcon.isNull() || !baseIcon.isNull()) { if (!linkIcon.isNull() || !baseIcon.isNull()) {
const auto sizes = baseIcon.availableSizes(QIcon::Normal, QIcon::Off); const auto sizes = baseIcon.availableSizes(QIcon::Normal, QIcon::Off);
const auto dpr = qt_getDevicePixelRatio(widget); const auto dpr = qt_getDevicePixelRatio(widget);
@ -5771,26 +5773,6 @@ QIcon QCommonStylePrivate::iconFromApplicationTheme(QCommonStyle::StandardPixmap
return icon; return icon;
} }
break; break;
case QStyle::SP_DirLinkIcon: {
QIcon icon;
const QIcon linkIcon = QIcon::fromTheme("emblem-symbolic-link"_L1);
const QIcon baseIcon = iconFromApplicationTheme(QStyle::SP_DirIcon,
option, widget);
if (!linkIcon.isNull() || !baseIcon.isNull()) {
const auto sizes = baseIcon.availableSizes(QIcon::Normal, QIcon::Off);
const auto dpr = qt_getDevicePixelRatio(widget);
for (const auto size : sizes) {
QPixmap basePixmap = baseIcon.pixmap(size, dpr);
QPixmap linkPixmap = linkIcon.pixmap(size / 2, dpr);
QPainter painter(&basePixmap);
const auto w = size.width() / 2;
painter.drawPixmap(w, w, linkPixmap);
icon.addPixmap(basePixmap);
}
}
return icon;
}
break;
case QStyle::SP_LineEditClearButton: { case QStyle::SP_LineEditClearButton: {
const QString directionalThemeName = rtl(option) const QString directionalThemeName = rtl(option)
? QStringLiteral("edit-clear-locationbar-ltr") : QStringLiteral("edit-clear-locationbar-rtl"); ? QStringLiteral("edit-clear-locationbar-ltr") : QStringLiteral("edit-clear-locationbar-rtl");