kotatogram/kotatogram-desktop
kotatogram/kotatogram-desktop
1
0
Fork 0
Code Issues Releases 45 Packages Wiki Activity

Custom icons should have priority (#35)

Browse source
This commit is contained in:
ilya-fedin 2020-05-04 18:42:59 +04:00 • committed by GitHub
parent e05f2b2865
commit a240ae5b84
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -177,7 +177,11 @@ QIcon TrayIconGen(int counter, bool muted) {
if (currentImageBack.isNull() if (currentImageBack.isNull()
|| iconThemeName != TrayIconThemeName || iconThemeName != TrayIconThemeName
|| iconName != TrayIconName) { || iconName != TrayIconName) {
if (!iconName.isEmpty()) { if (QFileInfo::exists(cWorkingDir() + "tdata/icon.png")) {
currentImageBack = QImage(cWorkingDir() + "tdata/icon.png");
} else if (cCustomAppIcon() != 0) {
currentImageBack = Core::App().logo(cCustomAppIcon());
} else if (!iconName.isEmpty()) {
if (systemIcon.isNull()) { if (systemIcon.isNull()) {
systemIcon = QIcon::fromTheme(iconName); systemIcon = QIcon::fromTheme(iconName);
} }
@ -199,10 +203,7 @@ QIcon TrayIconGen(int counter, bool muted) {
.toImage(); .toImage();
} }
} else { } else {
currentImageBack = QImage(cWorkingDir() + "tdata/icon.png"); currentImageBack = Core::App().logo();
if (currentImageBack.isNull()) {
currentImageBack = Core::App().logo(cCustomAppIcon());
}
} }
if (currentImageBack.size() != desiredSize) { if (currentImageBack.size() != desiredSize) {