Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 18:23:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

[REGEDIT] Improve arrow button visual (#2133)

Browse source 
Add IDI_ARROW resource icon and use it for the arrow button.
This commit is contained in:
Katayama Hirofumi MZ 2019-12-07 10:09:44 +09:00 • committed by GitHub
parent 007f32a223
commit 4c5b21f06c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
base/applications/regedit/childwnd.c
View file

@ -394,6 +394,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
WNDPROC oldproc; WNDPROC oldproc;
HFONT hFont; HFONT hFont;
WCHAR buffer[MAX_PATH]; WCHAR buffer[MAX_PATH];
DWORD style;
/* Load "My Computer" string */ /* Load "My Computer" string */
LoadStringW(hInst, IDS_MY_COMPUTER, buffer, COUNT_OF(buffer)); LoadStringW(hInst, IDS_MY_COMPUTER, buffer, COUNT_OF(buffer));
@ -404,12 +405,21 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
wcsncpy(g_pChildWnd->szPath, buffer, MAX_PATH); wcsncpy(g_pChildWnd->szPath, buffer, MAX_PATH);
g_pChildWnd->nSplitPos = 190; g_pChildWnd->nSplitPos = 190;
g_pChildWnd->hWnd = hWnd; g_pChildWnd->hWnd = hWnd;
g_pChildWnd->hAddressBarWnd = CreateWindowExW(WS_EX_CLIENTEDGE, L"Edit", NULL, WS_CHILD | WS_VISIBLE | WS_CHILDWINDOW | WS_TABSTOP,
style = WS_CHILD | WS_VISIBLE | WS_TABSTOP;
g_pChildWnd->hAddressBarWnd = CreateWindowExW(WS_EX_CLIENTEDGE, L"Edit", NULL, style,
CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
hWnd, (HMENU)0, hInst, 0); hWnd, (HMENU)0, hInst, 0);
g_pChildWnd->hAddressBtnWnd = CreateWindowExW(0, L"Button", L"\x00BB", WS_CHILD | WS_VISIBLE | WS_CHILDWINDOW | WS_TABSTOP | BS_TEXT | BS_CENTER | BS_VCENTER | BS_FLAT | BS_DEFPUSHBUTTON,
style = WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_ICON | BS_CENTER |
BS_VCENTER | BS_FLAT | BS_DEFPUSHBUTTON;
g_pChildWnd->hAddressBtnWnd = CreateWindowExW(0, L"Button", L"\x00BB", style,
CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
hWnd, (HMENU)0, hInst, 0); hWnd, (HMENU)0, hInst, 0);
g_pChildWnd->hArrowIcon = (HICON)LoadImageW(hInst, MAKEINTRESOURCEW(IDI_ARROW),
IMAGE_ICON, 12, 12, 0);
SendMessageW(g_pChildWnd->hAddressBtnWnd, BM_SETIMAGE, IMAGE_ICON, (LPARAM)g_pChildWnd->hArrowIcon);
GetClientRect(hWnd, &rc); GetClientRect(hWnd, &rc);
g_pChildWnd->hTreeWnd = CreateTreeView(hWnd, g_pChildWnd->szPath, (HMENU) TREE_WINDOW); g_pChildWnd->hTreeWnd = CreateTreeView(hWnd, g_pChildWnd->szPath, (HMENU) TREE_WINDOW);
g_pChildWnd->hListWnd = CreateListView(hWnd, (HMENU) LIST_WINDOW, rc.right - g_pChildWnd->nSplitPos); g_pChildWnd->hListWnd = CreateListView(hWnd, (HMENU) LIST_WINDOW, rc.right - g_pChildWnd->nSplitPos);
@ -462,6 +472,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
DestroyListView(g_pChildWnd->hListWnd); DestroyListView(g_pChildWnd->hListWnd);
DestroyTreeView(g_pChildWnd->hTreeWnd); DestroyTreeView(g_pChildWnd->hTreeWnd);
DestroyMainMenu(); DestroyMainMenu();
DestroyIcon(g_pChildWnd->hArrowIcon);
HeapFree(GetProcessHeap(), 0, g_pChildWnd); HeapFree(GetProcessHeap(), 0, g_pChildWnd);
g_pChildWnd = NULL; g_pChildWnd = NULL;
PostQuitMessage(0); PostQuitMessage(0);

1
base/applications/regedit/main.h
View file

@ -61,6 +61,7 @@ typedef struct
HWND hListWnd; HWND hListWnd;
HWND hAddressBarWnd; HWND hAddressBarWnd;
HWND hAddressBtnWnd; HWND hAddressBtnWnd;
HICON hArrowIcon;
int nFocusPanel; /* 0: left 1: right */ int nFocusPanel; /* 0: left 1: right */
int nSplitPos; int nSplitPos;
WINDOWPLACEMENT pos; WINDOWPLACEMENT pos;

1
base/applications/regedit/regedit.rc
View file

@ -40,6 +40,7 @@ IDI_STRING ICON "res/string.ico"
IDI_BIN ICON "res/bin.ico" IDI_BIN ICON "res/bin.ico"
IDI_REGEDIT ICON "res/regedit.ico" IDI_REGEDIT ICON "res/regedit.ico"
IDI_REGFILE ICON "res/regfile.ico" IDI_REGFILE ICON "res/regfile.ico"
IDI_ARROW ICON "res/arrow.ico"
/* UTF-8 */ /* UTF-8 */
#pragma code_page(65001) #pragma code_page(65001)

BIN
base/applications/regedit/res/arrow.ico Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 542 B

1
base/applications/regedit/resource.h
View file

@ -34,6 +34,7 @@
#define IDS_APP_TITLE 103 #define IDS_APP_TITLE 103
#define IDI_REGEDIT 100 #define IDI_REGEDIT 100
#define IDI_REGFILE 101 #define IDI_REGFILE 101
#define IDI_ARROW 102
#define IDI_SMALL 108 #define IDI_SMALL 108
#define IDC_REGEDIT 109 #define IDC_REGEDIT 109
#define IDC_REGEDIT_FRAME 110 #define IDC_REGEDIT_FRAME 110