From 9823615a84e302f281fe5fb6fbe5754f0b981525 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 16 Mar 2020 15:43:15 +0400
Subject: [PATCH] Check if icon has desired size when saving

---
 .../platform/linux/main_window_linux.cpp      | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
index 874e37078..347395ab3 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
@@ -167,8 +167,7 @@ QIcon TrayIconGen(int counter, bool muted) {
 						.pixmap(desiredSize)
 						.toImage();
 				} else {
-					const auto availableSizes = systemIcon
-						.availableSizes();
+					const auto availableSizes = systemIcon.availableSizes();
 
 					const auto biggestSize = ranges::max_element(
 						availableSizes,
@@ -260,12 +259,33 @@ std::unique_ptr<QTemporaryFile> TrayIconFile(
 	static const auto templateName = AppRuntimeDirectory()
 		+ kTrayIconFilename.utf16();
 
+	const auto desiredSize = QSize(size, size);
+
 	auto ret = std::make_unique<QTemporaryFile>(
 		templateName,
 		parent);
 
 	ret->open();
-	icon.pixmap(size).save(ret.get());
+
+	if (icon.actualSize(desiredSize) == desiredSize) {
+		icon.pixmap(desiredSize).save(ret.get());
+	} else {
+		const auto availableSizes = icon.availableSizes();
+
+		const auto biggestSize = ranges::max_element(
+			availableSizes,
+			std::less<>(),
+			&QSize::width);
+
+		icon
+			.pixmap(*biggestSize)
+			.scaled(
+				desiredSize,
+				Qt::IgnoreAspectRatio,
+				Qt::SmoothTransformation)
+			.save(ret.get());
+	}
+
 	ret->close();
 
 	return ret;
@@ -400,13 +420,13 @@ void MainWindow::initHook() {
 	cSetSupportTray(trayAvailable);
 
 #ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
-    auto sniWatcher = new QDBusServiceWatcher(
+	auto sniWatcher = new QDBusServiceWatcher(
 		kSNIWatcherService.utf16(),
 		QDBusConnection::sessionBus(),
 		QDBusServiceWatcher::WatchForOwnerChange,
 		this);
 
-    connect(
+	connect(
 		sniWatcher,
 		&QDBusServiceWatcher::serviceOwnerChanged,
 		this,