Skip to content

fix: Display bubble icon normally #913

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
Nov 29, 2024
Merged

fix: Display bubble icon normally #913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions panels/notification/bubble/bubbleitem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,6 @@ static QString imagePathOfNotification(const QVariantMap &hints, const QString &
static const QStringList HintsOrder {
"desktop-entry",
"image-data",
"image-path",
"image_path",
"icon_data"
};

Expand All @@ -147,10 +145,9 @@ static QString imagePathOfNotification(const QVariantMap &hints, const QString &
img.save(file.fileName());
return file.fileName();
}
QIcon icon = decodeIconFromPath(imageData, appName);
if (icon.isNull()) {
qCWarning(notifyLog) << "Can't get icon for notification, appName:" << appName;
}

DGUI_USE_NAMESPACE;
auto icon = DIconTheme::findQIcon(appName, DIconTheme::findQIcon("application-x-desktop"));
return icon.name();
}

Expand Down Expand Up @@ -197,6 +194,10 @@ QString BubbleItem::appName() const

QString BubbleItem::appIcon() const
{
if (!m_entity.appIcon().isEmpty()) {
return m_entity.appIcon();
}

return imagePathOfNotification(m_entity.hints(), m_entity.appIcon(), m_entity.appName());
}

Expand Down
3 changes: 2 additions & 1 deletion panels/notification/plugin/NotifyItemContent.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ NotifyItem {
}
}

background: NotifyItemBackground {
background: Rectangle {
color: Qt.rgba(0, 0, 0, 0.3)
}
}