feat(ui): high-res status icons; display larger icons in WeaselPanel

rime · Feb 8, 2019 · 093fa80 · 093fa80
1 parent a32f2d1
commit 093fa80
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 3 deletions.
diff --git a/WeaselTSF/LanguageBar.cpp b/WeaselTSF/LanguageBar.cpp
@@ -59,7 +59,7 @@ STDAPI CLangBarItemButton::QueryInterface(REFIID riid, void **ppvObject)
 		*ppvObject = (ITfLangBarItemButton *) this;
 	else if (IsEqualIID(riid, IID_ITfSource))
 		*ppvObject = (ITfSource *) this;
-	
+
 	if (*ppvObject)
 	{
 		AddRef();
@@ -153,7 +153,13 @@ STDAPI CLangBarItemButton::OnMenuSelect(UINT wID)
 
 STDAPI CLangBarItemButton::GetIcon(HICON *phIcon)
 {
-	*phIcon = (HICON) LoadImageW(g_hInst, MAKEINTRESOURCEW(ascii_mode ? IDI_EN_256 : IDI_ZH_256), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED);
+	*phIcon = (HICON) LoadImageW(
+		g_hInst,
+		MAKEINTRESOURCEW(ascii_mode ? IDI_EN : IDI_ZH),
+		IMAGE_ICON,
+		GetSystemMetrics(SM_CXSMICON),
+		GetSystemMetrics(SM_CYSMICON),
+		LR_SHARED);
 	return (*phIcon == NULL)? E_FAIL: S_OK;
 }
 

diff --git a/WeaselTSF/WeaselTSF.rc b/WeaselTSF/WeaselTSF.rc
diff --git a/WeaselUI/StandardLayout.h b/WeaselUI/StandardLayout.h
@@ -5,7 +5,7 @@
 namespace weasel
 {
 	const int MAX_CANDIDATES_COUNT = 10;
-	const int STATUS_ICON_SIZE = GetSystemMetrics(SM_CXSMICON);
+	const int STATUS_ICON_SIZE = GetSystemMetrics(SM_CXICON);
 
 	class StandardLayout: public Layout
 	{

diff --git a/include/resource.h b/include/resource.h
diff --git a/resource/en.ico b/resource/en.ico
diff --git a/resource/en_256.ico b/resource/en_256.ico
diff --git a/resource/reload.ico b/resource/reload.ico
diff --git a/resource/zh.ico b/resource/zh.ico
diff --git a/resource/zh_256.ico b/resource/zh_256.ico