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

Fixes for window icon (#38)

Browse source 
* Give priority for custom icon on linux
* Add support for icon from file, as in tray
This commit is contained in:
ilya-fedin 2020-05-06 22:55:57 +04:00 • committed by GitHub
parent 8487cf2a38
commit e425912490
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Telegram/SourceFiles/window/main_window.cpp
View file

@ -119,20 +119,37 @@ void ConvertIconToBlack(QImage &image) {
} }
QIcon CreateOfficialIcon(Main::Account *account) { QIcon CreateOfficialIcon(Main::Account *account) {
auto image = Core::IsAppLaunched() ? Core::App().logo(cCustomAppIcon()) : LoadLogo(cCustomAppIcon()); const auto customIcon = QImage(cWorkingDir() + "tdata/icon.png");
auto image = customIcon.isNull()
? Core::IsAppLaunched()
? Core::App().logo(cCustomAppIcon())
: LoadLogo(cCustomAppIcon())
: customIcon;
if (account if (account
&& account->sessionExists() && account->sessionExists()
&& account->session().supportMode()) { && account->session().supportMode()) {
ConvertIconToBlack(image); ConvertIconToBlack(image);
} }
return QIcon(App::pixmapFromImageInPlace(std::move(image))); return QIcon(App::pixmapFromImageInPlace(std::move(image)));
} }
QIcon CreateIcon(Main::Account *account) { QIcon CreateIcon(Main::Account *account) {
auto result = CreateOfficialIcon(account); auto result = CreateOfficialIcon(account);
#ifdef Q_OS_LINUX #ifdef Q_OS_LINUX
return QIcon::fromTheme(Platform::GetIconName(), result); if (
(!account
|| !account->sessionExists()
|| !account->session().supportMode())
&& cCustomAppIcon() == 0
&& !QFileInfo::exists(cWorkingDir() + "tdata/icon.png")) {
return QIcon::fromTheme(Platform::GetIconName(), result);
}
#endif #endif
return result; return result;
} }