Skip to content

refactor: improve app icon retrieval with small2 fallback #240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sigoden merged 1 commit into from
Jun 8, 2026
Merged

refactor: improve app icon retrieval with small2 fallback #240

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 32 additions & 22 deletions src/utils/app_icon.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ use windows::{
Shell::{SHGetFileInfoW, SHGetImageList, SHFILEINFOW, SHGFI_SYSICONINDEX},
WindowsAndMessaging::{
CopyIcon, CreateIconFromResourceEx, DestroyIcon, GetIconInfo, LoadIconW,
LoadImageW, SendMessageTimeoutW, GCLP_HICONSM, GCL_HICON, HICON, ICONINFO,
ICON_BIG, IDI_APPLICATION, IMAGE_ICON, LR_DEFAULTCOLOR, LR_DEFAULTSIZE,
LoadImageW, SendMessageTimeoutW, GCLP_HICON, HICON, ICONINFO, ICON_BIG,
ICON_SMALL2, IDI_APPLICATION, IMAGE_ICON, LR_DEFAULTCOLOR, LR_DEFAULTSIZE,
LR_LOADFROMFILE, SMTO_ABORTIFHUNG, WM_GETICON,
},
},
Expand Down Expand Up @@ -205,20 +205,27 @@ pub fn get_window_icon(hwnd: HWND) -> Option<HICON> {
return unsafe { CopyIcon(HICON(result as _)) }.ok();
}
#[cfg(target_arch = "x86")]
let ret = unsafe { windows::Win32::UI::WindowsAndMessaging::GetClassLongW(hwnd, GCL_HICON) };
#[cfg(not(target_arch = "x86"))]
let ret = unsafe { windows::Win32::UI::WindowsAndMessaging::GetClassLongPtrW(hwnd, GCL_HICON) };
if ret != 0 {
return unsafe { CopyIcon(HICON(ret as _)) }.ok();
}
#[cfg(target_arch = "x86")]
let ret = unsafe { windows::Win32::UI::WindowsAndMessaging::GetClassLongW(hwnd, GCLP_HICONSM) };
let ret = unsafe { windows::Win32::UI::WindowsAndMessaging::GetClassLongW(hwnd, GCLP_HICON) };
#[cfg(not(target_arch = "x86"))]
let ret =
unsafe { windows::Win32::UI::WindowsAndMessaging::GetClassLongPtrW(hwnd, GCLP_HICONSM) };
unsafe { windows::Win32::UI::WindowsAndMessaging::GetClassLongPtrW(hwnd, GCLP_HICON) };
if ret != 0 {
return unsafe { CopyIcon(HICON(ret as _)) }.ok();
}
let ret = unsafe {
SendMessageTimeoutW(
hwnd,
WM_GETICON,
WPARAM(ICON_SMALL2 as _),
LPARAM(0),
SMTO_ABORTIFHUNG,
250,
Some(&mut result),
)
};
if ret.0 != 0 && result != 0 {
return unsafe { CopyIcon(HICON(result as _)) }.ok();
}
None
}

Expand Down Expand Up @@ -278,12 +285,17 @@ fn get_exe_icon(module_path: &str) -> Option<HICON> {
let info = get_shfileinfo(module_path)?;
for shil in [SHIL_JUMBO, SHIL_EXTRALARGE, SHIL_LARGE] {
unsafe {
let list = SHGetImageList::<IImageList>(shil).ok()?;
let hicon = list.GetIcon(info.iIcon, 1u32).ok()?;
if is_valid_icon(hicon) {
return Some(hicon);
} else {
let _ = DestroyIcon(hicon);
let Some(list) = SHGetImageList::<IImageList>(shil).ok() else {
continue;
};
let Some(hicon) = list.GetIcon(info.iIcon, 1u32).ok() else {
continue;
};
match is_valid_icon(hicon) {
Some(true) => return Some(hicon),
_ => {
let _ = DestroyIcon(hicon);
}
}
}
}
Expand Down Expand Up @@ -323,11 +335,9 @@ fn get_shfileinfo(module_path: &str) -> Option<SHFILEINFOW> {
/// while the rest is stretched/padded garbage — e.g. the icon of `hh.exe`
/// (Windows's help viewer, reused by AutoHotKey, etc. to display their *.chm help).
/// These look ugly in the switcher and are better replaced with a fallback icon.
pub fn is_valid_icon(hicon: HICON) -> bool {
let Some(bounds) = get_icon_bounds(hicon) else {
return false;
};
!is_topleft_icon(&bounds)
fn is_valid_icon(hicon: HICON) -> Option<bool> {
let bounds = get_icon_bounds(hicon)?;
Some(!is_topleft_icon(&bounds))
}

struct IconBounds {
Expand Down
Loading