mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 06:26:18 +00:00
Code Issues Releases Wiki Activity

Fix support icon on Linux when system icon is present

Browse Source
This commit is contained in:
Ilya Fedin
2022-01-22 18:04:05 +04:00
committed by John Preston
parent 26dbeb6831
commit 692adacc2a
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Telegram/SourceFiles/window/main_window.cpp
View File

@@ -106,20 +106,24 @@ void ConvertIconToBlack(QImage &image) {
}
}
QIcon CreateOfficialIcon(Main::Session *session, bool returnNullIfDefault) {
QIcon CreateOfficialIcon(Main::Session *session) {
const auto support = (session && session->supportMode());
if (!support && returnNullIfDefault) {
if (!support) {
return QIcon();
}
auto image = Logo();
if (support) {
ConvertIconToBlack(image);
}
ConvertIconToBlack(image);
return QIcon(Ui::PixmapFromImage(std::move(image)));
}
QIcon CreateIcon(Main::Session *session, bool returnNullIfDefault) {
auto result = CreateOfficialIcon(session, returnNullIfDefault);
const auto officialIcon = CreateOfficialIcon(session);
if (!officialIcon.isNull() || returnNullIfDefault) {
return officialIcon;
}
auto result = QIcon(Ui::PixmapFromImage(Logo()));
#if defined Q_OS_UNIX && !defined Q_OS_MAC
const auto iconFromTheme = QIcon::fromTheme(
Platform::GetIconName(),
@@ -159,6 +163,7 @@ QIcon CreateIcon(Main::Session *session, bool returnNullIfDefault) {
result.addPixmap(iconPixmap);
}
#endif
return result;
}