procyberian/tdesktop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Create QSystemTrayIcon even when tray is not supported

Browse source 
QSystemTrayIcon provides no public API to know when tray icon support appears, but can subscribe to native events internally

This should help for environments where a race condition between applications autostart and tray service autostart present in case Qt is subscribed internally
This commit is contained in:
Ilya Fedin 2022-09-02 17:08:04 +04:00 committed by John Preston
parent c18313614b
commit 12d8d193a1
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Telegram/SourceFiles/tray.cpp
View file

@ -21,17 +21,13 @@ Tray::Tray() {
void Tray::create() {
rebuildMenu();
using WorkMode = Settings::WorkMode;
if (Platform::TrayIconSupported()
&& (Core::App().settings().workMode() != WorkMode::WindowOnly)) {
if (Core::App().settings().workMode() != WorkMode::WindowOnly) {
_tray.createIcon();
}
Core::App().settings().workModeValue(
) | rpl::combine_previous(
) | rpl::start_with_next([=](WorkMode previous, WorkMode state) {
if (!Platform::TrayIconSupported()) {
return;
}
const auto wasHasIcon = (previous != WorkMode::WindowOnly);
const auto nowHasIcon = (state != WorkMode::WindowOnly);
if (wasHasIcon != nowHasIcon) {
@ -182,7 +178,7 @@ void Tray::toggleSoundNotifications() {
}
bool Tray::has() const {
return _tray.hasIcon();
return _tray.hasIcon() && Platform::TrayIconSupported();
}
} // namespace Core