mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-02 07:35:12 +00:00
Code Issues Releases Wiki Activity

Fixed custom icon on Windows

Browse Source
This commit is contained in:
RadRussianRus
2021-12-17 16:10:45 +03:00
parent 1ef451b1ed
commit 99debb9730
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Telegram/SourceFiles/platform/win/main_window_win.cpp
View File

@@ -77,10 +77,11 @@ using namespace Microsoft::WRL;
Main::Session *session, Main::Session *session,
bool smallIcon) { bool smallIcon) {
static constexpr auto kCount = 3; static constexpr auto kCount = 3;
static constexpr auto kLogoCount = 6; static constexpr auto kLogoCount = 7;
static constexpr auto kTotalCount = kLogoCount * kCount; static constexpr auto kTotalCount = kLogoCount * kCount;
static auto ScaledLogo = std::array<QImage, kTotalCount>(); static auto ScaledLogo = std::array<QImage, kTotalCount>();
static auto ScaledLogoNoMargin = std::array<QImage, kTotalCount>(); static auto ScaledLogoNoMargin = std::array<QImage, kTotalCount>();
static auto CustomIcon = QImage(cWorkingDir() + "tdata/icon.png");
struct Dimensions { struct Dimensions {
int index = 0; int index = 0;
@@ -109,9 +110,13 @@ using namespace Microsoft::WRL;
auto &scaled = smallIcon ? ScaledLogoNoMargin : ScaledLogo; auto &scaled = smallIcon ? ScaledLogoNoMargin : ScaledLogo;
auto result = [&] { auto result = [&] {
auto &image = scaled[cCustomAppIcon() * kCount + d.index]; const auto idx = CustomIcon.isNull() ? cCustomAppIcon() : kLogoCount - 1;
auto &image = scaled[idx * kCount + d.index];
if (image.isNull()) { if (image.isNull()) {
image = (smallIcon image = !CustomIcon.isNull()
? CustomIcon.scaledToWidth(d.size, Qt::SmoothTransformation)
: (smallIcon
? Window::LogoNoMargin(cCustomAppIcon()) ? Window::LogoNoMargin(cCustomAppIcon())
: Window::Logo(cCustomAppIcon())).scaledToWidth( : Window::Logo(cCustomAppIcon())).scaledToWidth(
d.size, d.size,