void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-08 16:13:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove TDESKTOP_FORCE_PANEL_ICON variable since tdesktop gets current icon theme just fine now

Browse source
This commit is contained in:
Ilya Fedin 2020-11-04 11:35:02 +04:00 • committed by John Preston
parent 55167ea95b
commit ede7ad1a4c
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Telegram/SourceFiles/platform/linux/main_window_linux.cpp
View file

@ -58,7 +58,6 @@ namespace Platform {
namespace { namespace {
constexpr auto kDisableTrayCounter = "TDESKTOP_DISABLE_TRAY_COUNTER"_cs; constexpr auto kDisableTrayCounter = "TDESKTOP_DISABLE_TRAY_COUNTER"_cs;
constexpr auto kForcePanelIcon = "TDESKTOP_FORCE_PANEL_ICON"_cs;
constexpr auto kPanelTrayIconName = "telegram-panel"_cs; constexpr auto kPanelTrayIconName = "telegram-panel"_cs;
constexpr auto kMutePanelTrayIconName = "telegram-mute-panel"_cs; constexpr auto kMutePanelTrayIconName = "telegram-mute-panel"_cs;
constexpr auto kAttentionPanelTrayIconName = "telegram-attention-panel"_cs; constexpr auto kAttentionPanelTrayIconName = "telegram-attention-panel"_cs;
@ -149,8 +148,7 @@ QString GetTrayIconName(int counter, bool muted) {
const auto iconName = GetIconName(); const auto iconName = GetIconName();
const auto panelIconName = GetPanelIconName(counter, muted); const auto panelIconName = GetPanelIconName(counter, muted);
if (QIcon::hasThemeIcon(panelIconName) if (QIcon::hasThemeIcon(panelIconName)) {
|| qEnvironmentVariableIsSet(kForcePanelIcon.utf8())) {
return panelIconName; return panelIconName;
} else if (QIcon::hasThemeIcon(iconName)) { } else if (QIcon::hasThemeIcon(iconName)) {
return iconName; return iconName;