From 37fc706446c04c45c0e4c353002af8ed3f6daae1 Mon Sep 17 00:00:00 2001
From: Xu <blinue@outlook.com>
Date: Wed, 26 Jun 2024 20:25:58 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=A0=8F=E5=9B=BE=E6=A0=87=E7=9A=84=E6=80=A7?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Magpie.App/IconHelper.cpp      | 25 ++++++++++++++++++++++---
 src/Magpie.App/IconHelper.h        |  2 +-
 src/Magpie.App/TitlebarControl.cpp |  3 +--
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/Magpie.App/IconHelper.cpp b/src/Magpie.App/IconHelper.cpp
index 17d265e14..6846241f5 100644
--- a/src/Magpie.App/IconHelper.cpp
+++ b/src/Magpie.App/IconHelper.cpp
@@ -1,15 +1,14 @@
 #include "pch.h"
 #include "IconHelper.h"
 #include "Logger.h"
-#include "Utils.h"
 #include "Win32Utils.h"
 #include "StrUtils.h"
+#include "CommonSharedConstants.h"
 
 using namespace winrt;
 using namespace Windows::Graphics::Imaging;
 using namespace Windows::UI::Xaml::Media::Imaging;
 
-
 namespace winrt::Magpie::App {
 
 static bool CopyPixelsOfHBmp(HBITMAP hBmp, LONG width, LONG height, void* data) noexcept {
@@ -92,11 +91,12 @@ static SoftwareBitmap HIcon2SoftwareBitmap(HICON hIcon) {
 
 			for (uint32_t i = 0; i < pixelsSize; i += 4) {
 				// hbmMask 表示是否应用掩码
-				// 如果需要应用掩码而掩码不为零，那么这个图标无法转换为彩色图标，这种情况下直接忽略掩码
+				// 如果需要应用掩码而掩码不为零，那么无损转换为彩色图标是不可能的，这里直接使用掩码作为颜色
 				if (maskData[i] != 0 && pixels[i] == 0 && pixels[i + 1] == 0 && pixels[i + 2] == 0) {
 					// 掩码全为 0 表示透明像素
 					std::memset(pixels + i, 0, 4);
 				} else {
+					// 无需应用掩码或掩码不为零
 					pixels[i + 3] = 255;
 				}
 			}
@@ -261,4 +261,23 @@ SoftwareBitmap IconHelper::ExtractIconFromExe(const wchar_t* fileName, uint32_t
 	return bitmap;
 }
 
+SoftwareBitmap IconHelper::ExtractAppIcon(uint32_t preferredSize) {
+	// 作为性能优化，使用 LoadImage 而不是 SHDefExtractIcon 加载程序图标。
+	// 经测试，LoadImage 快两倍左右。
+	wil::unique_hicon hIcon((HICON)LoadImage(
+		GetModuleHandle(nullptr),
+		MAKEINTRESOURCE(CommonSharedConstants::IDI_APP),
+		IMAGE_ICON,
+		preferredSize,
+		preferredSize,
+		LR_DEFAULTCOLOR
+	));
+	if (!hIcon) {
+		Logger::Get().Win32Error("提取程序图标失败");
+		return nullptr;
+	}
+
+	return HIcon2SoftwareBitmap(hIcon.get());
+}
+
 }
diff --git a/src/Magpie.App/IconHelper.h b/src/Magpie.App/IconHelper.h
index 0aab34968..2c7048cde 100644
--- a/src/Magpie.App/IconHelper.h
+++ b/src/Magpie.App/IconHelper.h
@@ -4,8 +4,8 @@ namespace winrt::Magpie::App {
 
 struct IconHelper {
 	static Windows::Graphics::Imaging::SoftwareBitmap ExtractIconFormWnd(HWND hWnd, uint32_t preferredSize, uint32_t dpi);
-
 	static Windows::Graphics::Imaging::SoftwareBitmap ExtractIconFromExe(const wchar_t* fileName, uint32_t preferredSize, uint32_t dpi);
+	static Windows::Graphics::Imaging::SoftwareBitmap ExtractAppIcon(uint32_t preferredSize);
 };
 
 }
diff --git a/src/Magpie.App/TitlebarControl.cpp b/src/Magpie.App/TitlebarControl.cpp
index f1eb28d6f..d55a5b580 100644
--- a/src/Magpie.App/TitlebarControl.cpp
+++ b/src/Magpie.App/TitlebarControl.cpp
@@ -17,8 +17,7 @@ TitleBarControl::TitleBarControl() {
 		auto weakThis = that->get_weak();
 
 		SoftwareBitmapSource bitmap;
-		co_await bitmap.SetBitmapAsync(IconHelper::ExtractIconFromExe(
-			Win32Utils::GetExePath().c_str(), 40, USER_DEFAULT_SCREEN_DPI));
+		co_await bitmap.SetBitmapAsync(IconHelper::ExtractAppIcon(40));
 
 		if (!weakThis.get()) {
 			co_return;