Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-21 20:50:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "[USER32] Make App Switcher use the owner window's icon (#1299)" (#1605)

Browse source 
This reverts commit 484943d04f.
This commit is contained in:
Katayama Hirofumi MZ 2019-06-03 08:47:43 +09:00 committed by GitHub
parent be88574f59
commit a73c17fcd9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
win32ss/user/user32/controls/appswitch.c
View file

@ -165,24 +165,20 @@ void CompleteSwitch(BOOL doSwitch)
BOOL CALLBACK EnumerateCallback(HWND window, LPARAM lParam) BOOL CALLBACK EnumerateCallback(HWND window, LPARAM lParam)
{ {
HICON hIcon; HICON hIcon;
HWND hwndIcon, hwndOwner;
UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(lParam);
hwndOwner = GetWindow(window, GW_OWNER);
hwndIcon = (hwndOwner ? hwndOwner : window);
// First try to get the big icon assigned to the window // First try to get the big icon assigned to the window
hIcon = (HICON)SendMessageW(hwndIcon, WM_GETICON, ICON_BIG, 0); hIcon = (HICON)SendMessageW(window, WM_GETICON, ICON_BIG, 0);
if (!hIcon) if (!hIcon)
{ {
// If no icon is assigned, try to get the icon assigned to the windows' class // If no icon is assigned, try to get the icon assigned to the windows' class
hIcon = (HICON)GetClassLongPtrW(hwndIcon, GCL_HICON); hIcon = (HICON)GetClassLongPtrW(window, GCL_HICON);
if (!hIcon) if (!hIcon)
{ {
// If we still don't have an icon, see if we can do with the small icon, // If we still don't have an icon, see if we can do with the small icon,
// or a default application icon // or a default application icon
hIcon = (HICON)SendMessageW(hwndIcon, WM_GETICON, ICON_SMALL2, 0); hIcon = (HICON)SendMessageW(window, WM_GETICON, ICON_SMALL2, 0);
if (!hIcon) if (!hIcon)
{ {
// using windows logo icon as default // using windows logo icon as default