refactor: 优化获取窗口图标

Blinue · Jun 30, 2024 · 4f96625 · 4f96625
1 parent bc3f7a9
commit 4f96625
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 20 deletions.
diff --git a/src/Magpie.App/AboutViewModel.cpp b/src/Magpie.App/AboutViewModel.cpp
@@ -42,8 +42,8 @@ AboutViewModel::AboutViewModel() {
 	([](AboutViewModel* that)->fire_and_forget {
 		auto weakThis = that->get_weak();
 		SoftwareBitmapSource bitmap;
-		co_await bitmap.SetBitmapAsync(IconHelper::ExtractIconFromExe(
-			Win32Utils::GetExePath().c_str(), 256, USER_DEFAULT_SCREEN_DPI));
+		co_await bitmap.SetBitmapAsync(
+			IconHelper::ExtractIconFromExe(Win32Utils::GetExePath().c_str(), 256));
 
 		if (!weakThis.get()) {
 			co_return;

diff --git a/src/Magpie.App/CandidateWindowItem.cpp b/src/Magpie.App/CandidateWindowItem.cpp
@@ -132,15 +132,16 @@ fire_and_forget CandidateWindowItem::_ResolveWindow(bool resolveIcon, bool resol
 	}
 
 	SoftwareBitmap iconBitmap{ nullptr };
+	const uint32_t iconSize = (uint32_t)std::lround(16 * dpi / double(USER_DEFAULT_SCREEN_DPI));
 
 	if (isPackaged) {
 		std::variant<std::wstring, SoftwareBitmap> uwpIcon =
-			reader.GetIcon((uint32_t)std::ceil(dpi * 16.0 / USER_DEFAULT_SCREEN_DPI), isLightTheme, true);
+			reader.GetIcon(iconSize, isLightTheme, true);
 		if (uwpIcon.index() == 1) {
 			iconBitmap = std::get<1>(uwpIcon);
 		}
 	} else {
-		iconBitmap = IconHelper::ExtractIconFormWnd(hWnd, 16, dpi);
+		iconBitmap = IconHelper::ExtractIconFormWnd(hWnd, iconSize);
 	}
 
 	// 切换到主线程

diff --git a/src/Magpie.App/IconHelper.cpp b/src/Magpie.App/IconHelper.cpp
@@ -131,7 +131,6 @@ static SIZE GetSizeOfIcon(HICON hIcon) noexcept {
 
 static HICON GetHIconOfWnd(HWND hWnd, LONG preferredSize) noexcept {
 	HICON result = NULL;
-
 	HICON candidateSmallIcon = NULL;
 
 	result = (HICON)SendMessage(hWnd, WM_GETICON, ICON_SMALL, 0);
@@ -180,17 +179,15 @@ static HICON GetHIconOfWnd(HWND hWnd, LONG preferredSize) noexcept {
 	return GetHIconOfWnd(hwndOwner, preferredSize);
 }
 
-SoftwareBitmap IconHelper::ExtractIconFormWnd(HWND hWnd, uint32_t preferredSize, uint32_t dpi) {
-	if (HICON hIcon = GetHIconOfWnd(hWnd, std::lround(preferredSize * dpi / double(USER_DEFAULT_SCREEN_DPI)))) {
+SoftwareBitmap IconHelper::ExtractIconFormWnd(HWND hWnd, uint32_t preferredSize) {
+	if (HICON hIcon = GetHIconOfWnd(hWnd, (LONG)preferredSize)) {
 		return HIcon2SoftwareBitmap(hIcon);
 	}
 
-	return ExtractIconFromExe(Win32Utils::GetPathOfWnd(hWnd).c_str(), preferredSize, dpi);
+	return ExtractIconFromExe(Win32Utils::GetPathOfWnd(hWnd).c_str(), preferredSize);
 }
 
-SoftwareBitmap IconHelper::ExtractIconFromExe(const wchar_t* fileName, uint32_t preferredSize, uint32_t dpi) {
-	preferredSize = (uint32_t)std::lround(preferredSize * dpi / double(USER_DEFAULT_SCREEN_DPI));
-
+SoftwareBitmap IconHelper::ExtractIconFromExe(const wchar_t* fileName, uint32_t preferredSize) {
 	{
 		wil::unique_hicon hIcon = NULL;
 		SHDefExtractIcon(fileName, 0, 0, hIcon.put(), NULL, preferredSize);

diff --git a/src/Magpie.App/IconHelper.h b/src/Magpie.App/IconHelper.h
@@ -3,8 +3,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 ExtractIconFormWnd(HWND hWnd, uint32_t preferredSize);
+	static Windows::Graphics::Imaging::SoftwareBitmap ExtractIconFromExe(const wchar_t* fileName, uint32_t preferredSize);
 	static Windows::Graphics::Imaging::SoftwareBitmap ExtractAppIcon(uint32_t preferredSize);
 };
 

diff --git a/src/Magpie.App/ProfileViewModel.cpp b/src/Magpie.App/ProfileViewModel.cpp
@@ -773,25 +773,24 @@ fire_and_forget ProfileViewModel::_LoadIcon(FrameworkElement const& rootPage) {
 		const bool isPackaged = _data->isPackaged;
 		const std::wstring path = _data->pathRule;
 		CoreDispatcher dispatcher = rootPage.Dispatcher();
-		const uint32_t dpi = (uint32_t)std::lroundf(_displayInformation.LogicalDpi());
+		const uint32_t iconSize = (uint32_t)std::lroundf(32 * _displayInformation.LogicalDpi() / USER_DEFAULT_SCREEN_DPI);
 
 		co_await resume_background();
 
-		static constexpr UINT ICON_SIZE = 32;
 		if (isPackaged) {
 			AppXReader appxReader;
 			[[maybe_unused]] bool result = appxReader.Initialize(path);
 			assert(result);
 
 			std::variant<std::wstring, SoftwareBitmap> uwpIcon =
-				appxReader.GetIcon((uint32_t)std::ceil(dpi * ICON_SIZE / double(USER_DEFAULT_SCREEN_DPI)), preferLightTheme);
+				appxReader.GetIcon(iconSize, preferLightTheme);
 			if (uwpIcon.index() == 0) {
 				iconPath = std::get<0>(uwpIcon);
 			} else {
 				iconBitmap = std::get<1>(uwpIcon);
 			}
 		} else {
-			iconBitmap = IconHelper::ExtractIconFromExe(path.c_str(), ICON_SIZE, dpi);
+			iconBitmap = IconHelper::ExtractIconFromExe(path.c_str(), iconSize);
 		}
 
 		co_await dispatcher;

diff --git a/src/Magpie.App/RootPage.cpp b/src/Magpie.App/RootPage.cpp
@@ -318,7 +318,7 @@ fire_and_forget RootPage::_LoadIcon(MUXC::NavigationViewItem const& item, const
 	bool isPackaged = profile.isPackaged;
 	std::wstring path = profile.pathRule;
 	CoreDispatcher dispatcher = Dispatcher();
-	uint32_t dpi = (uint32_t)std::lroundf(_displayInformation.LogicalDpi());
+	const uint32_t iconSize = (uint32_t)std::lroundf(16 * _displayInformation.LogicalDpi() / USER_DEFAULT_SCREEN_DPI);
 
 	co_await resume_background();
 
@@ -329,15 +329,15 @@ fire_and_forget RootPage::_LoadIcon(MUXC::NavigationViewItem const& item, const
 		AppXReader reader;
 		if (reader.Initialize(path)) {
 			std::variant<std::wstring, SoftwareBitmap> uwpIcon =
-				reader.GetIcon((uint32_t)std::ceil(dpi * 16.0 / USER_DEFAULT_SCREEN_DPI), preferLightTheme);
+				reader.GetIcon(iconSize, preferLightTheme);
 			if (uwpIcon.index() == 0) {
 				iconPath = std::get<0>(uwpIcon);
 			} else {
 				iconBitmap = std::get<1>(uwpIcon);
 			}
 		}
 	} else {
-		iconBitmap = IconHelper::ExtractIconFromExe(path.c_str(), 16, dpi);
+		iconBitmap = IconHelper::ExtractIconFromExe(path.c_str(), iconSize);
 	}
 
 	co_await dispatcher;