mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-10-11 14:06:25 +00:00
Code Issues Releases Wiki Activity

Unified function to detect icon name on Linux

Browse Source
This commit is contained in:
Ilya Fedin
2020-02-26 15:38:31 +04:00
committed by John Preston
parent 3b300f23e1
commit 7bd0598555
5 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Telegram/SourceFiles/platform/linux/main_window_linux.cpp
View File

@@ -31,7 +31,6 @@ namespace Platform {
namespace {
constexpr auto kDisableTrayCounter = "TDESKTOP_DISABLE_TRAY_COUNTER"_cs;
constexpr auto kTrayIconName = "telegram"_cs;
constexpr auto kPanelTrayIconName = "telegram-panel"_cs;
constexpr auto kMutePanelTrayIconName = "telegram-mute-panel"_cs;
constexpr auto kAttentionPanelTrayIconName = "telegram-attention-panel"_cs;
@@ -56,18 +55,13 @@ QString GetPanelIconName() {
}
QString GetTrayIconName() {
const auto iconName = GetIconName();
const auto panelIconName = GetPanelIconName();
if (QIcon::hasThemeIcon(panelIconName)) {
return panelIconName;
} else if (InSandbox()) {
const auto launcherBasename = GetLauncherBasename();
if (QIcon::hasThemeIcon(launcherBasename)) {
return launcherBasename;
}
} else if (QIcon::hasThemeIcon(kTrayIconName.utf16())) {
return kTrayIconName.utf16();
} else if (QIcon::hasThemeIcon(iconName)) {
return iconName;
}
return QString();