lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-05-31 08:17:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

[CPL][INPUT] s/IDI_KEY_SHORT_ICO/IDI_CPLSYSTEM/ and small icon

Browse Source 
The task icon of Taskbar was wrong...
This commit is contained in:
Katayama Hirofumi MZ
2022-09-14 03:39:18 +09:00
parent 8e110335e7
commit 976d48baeb
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dll/cpl/input/input.c
View File

@@ -39,13 +39,22 @@ static int CALLBACK
PropSheetProc(HWND hwndDlg, UINT uMsg, LPARAM lParam) PropSheetProc(HWND hwndDlg, UINT uMsg, LPARAM lParam)
{ {
// NOTE: This callback is needed to set large icon correctly. // NOTE: This callback is needed to set large icon correctly.
HICON hIcon; // FIXME: Handle leaks
HICON hIcon, hIconSmall;
switch (uMsg) switch (uMsg)
{ {
case PSCB_INITIALIZED: case PSCB_INITIALIZED:
{ {
hIcon = LoadIconW(hApplet, MAKEINTRESOURCEW(IDI_KEY_SHORT_ICO)); hIcon = LoadIconW(hApplet, MAKEINTRESOURCEW(IDI_CPLSYSTEM));
SendMessageW(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon); SendMessageW(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon);
hIconSmall = (HICON)LoadImageW(hApplet,
MAKEINTRESOURCEW(IDI_CPLSYSTEM),
IMAGE_ICON,
GetSystemMetrics(SM_CXSMICON),
GetSystemMetrics(SM_CYSMICON),
0);
SendMessageW(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)hIconSmall);
break; break;
} }
} }
@@ -65,7 +74,7 @@ SystemApplet(HWND hwnd, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
header.dwFlags = PSH_PROPSHEETPAGE | PSH_USEICONID | PSH_USECALLBACK; header.dwFlags = PSH_PROPSHEETPAGE | PSH_USEICONID | PSH_USECALLBACK;
header.hwndParent = hwnd; header.hwndParent = hwnd;
header.hInstance = hApplet; header.hInstance = hApplet;
header.pszIcon = MAKEINTRESOURCEW(IDI_KEY_SHORT_ICO); header.pszIcon = MAKEINTRESOURCEW(IDI_CPLSYSTEM);
header.pszCaption = MAKEINTRESOURCEW(IDS_CPLSYSTEMNAME); header.pszCaption = MAKEINTRESOURCEW(IDS_CPLSYSTEMNAME);
header.nPages = ARRAYSIZE(page); header.nPages = ARRAYSIZE(page);
header.nStartPage = 0; header.nStartPage = 0;

2
dll/cpl/input/input.rc
View File

@@ -12,7 +12,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
#define REACTOS_STR_ORIGINAL_FILENAME "input.dll" #define REACTOS_STR_ORIGINAL_FILENAME "input.dll"
#include <reactos/version.rc> #include <reactos/version.rc>
IDI_KEY_SHORT_ICO ICON "resources/keyboard-shortcuts.ico" IDI_CPLSYSTEM ICON "resources/keyboard-shortcuts.ico"
#include <reactos/manifest_hosted.rc> #include <reactos/manifest_hosted.rc>

1
dll/cpl/input/resource.h
View File

@@ -4,7 +4,6 @@
#define IDI_KEYBOARD_ICO 202 #define IDI_KEYBOARD_ICO 202
#define IDI_MARKER_ICO 205 #define IDI_MARKER_ICO 205
#define IDI_MIC_ICO 203 #define IDI_MIC_ICO 203
#define IDI_KEY_SHORT_ICO 200
#define IDI_INFO_ICO 207 #define IDI_INFO_ICO 207
#define IDI_CPLSYSTEM 1502 #define IDI_CPLSYSTEM 1502