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

[REGEDIT] Handle Ctrl+Backspace in AddressBar (#7140)

Browse source 
Notes:
- Also fixes a bug where Del does not work in the AddressBar nor during Tree/List label edit because it gets eaten by the accelerator.
- Removed the code that handles CtrlA in the AddressBar because the Edit control does this out of the box.
This commit is contained in:
Whindmar Saksit 2024-07-17 12:40:32 +02:00 • committed by GitHub
parent 075894bc44
commit 28cb0995e6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 92 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

37
base/applications/regedit/main.c
View file

@ -176,25 +176,36 @@ void ExitInstance(HINSTANCE hInstance)
UnloadAclUiDll();
}
BOOL TranslateChildTabMessage(PMSG msg)
static BOOL InLabelEdit(HWND hWnd, UINT Msg)
{
HWND hEdit = (HWND)SendMessageW(hWnd, Msg, 0, 0);
return hEdit && IsWindowVisible(hEdit);
}
static BOOL TranslateChildTabMessage(PMSG msg)
{
if (msg->message != WM_KEYDOWN) return FALSE;
/* Allow Ctrl+A on address bar */
if ((msg->hwnd == g_pChildWnd->hAddressBarWnd) &&
(msg->message == WM_KEYDOWN) &&
(msg->wParam == L'A') && (GetKeyState(VK_CONTROL) < 0))
{
SendMessageW(msg->hwnd, EM_SETSEL, 0, -1);
return TRUE;
}
if (msg->wParam != VK_TAB) return FALSE;
if (GetParent(msg->hwnd) != g_pChildWnd->hWnd) return FALSE;
PostMessageW(hFrameWnd, WM_COMMAND, ID_SWITCH_PANELS, 0);
return TRUE;
}
static BOOL TranslateRegeditAccelerator(HWND hWnd, HACCEL hAccTable, PMSG msg)
{
if (msg->message == WM_KEYDOWN)
{
if (msg->wParam == VK_DELETE)
{
if (g_pChildWnd->hAddressBarWnd == msg->hwnd)
return FALSE;
if (InLabelEdit(g_pChildWnd->hTreeWnd, TVM_GETEDITCONTROL) || InLabelEdit(g_pChildWnd->hListWnd, LVM_GETEDITCONTROL))
return FALSE;
}
}
return TranslateAcceleratorW(hWnd, hAccTable, msg);
}
int WINAPI wWinMain(HINSTANCE hInstance,
HINSTANCE hPrevInstance,
LPWSTR lpCmdLine,
@ -205,6 +216,8 @@ int WINAPI wWinMain(HINSTANCE hInstance,
UNREFERENCED_PARAMETER(hPrevInstance);
OleInitialize(NULL);
/* Initialize global strings */
LoadStringW(hInstance, IDS_APP_TITLE, szTitle, ARRAY_SIZE(szTitle));
LoadStringW(hInstance, IDC_REGEDIT_FRAME, szFrameClass, ARRAY_SIZE(szFrameClass));
@ -237,7 +250,7 @@ int WINAPI wWinMain(HINSTANCE hInstance,
/* Main message loop */
while (GetMessageW(&msg, NULL, 0, 0))
{
if (!TranslateAcceleratorW(hFrameWnd, hAccel, &msg) &&
if (!TranslateRegeditAccelerator(hFrameWnd, hAccel, &msg) &&
!TranslateChildTabMessage(&msg))
{
TranslateMessage(&msg);