Skip to content

Commit

Permalink
Detect CTRL+A key combination to select all text in EditBox (#2251)
Browse files Browse the repository at this point in the history
* Detect CTRL+A key combination to select all text in EditBox

* Ensure EditBox has focus before checking for CTRL+A combination
  • Loading branch information
rh101 authored Nov 26, 2024
1 parent 57c3e6c commit 1e8fbb9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 15 deletions.
20 changes: 6 additions & 14 deletions core/ui/UIEditBox/UIEditBoxImpl-win32.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ EditBoxImpl* __createSystemEditBox(EditBox* pEditBox)

EditBoxImplWin::EditBoxImplWin(EditBox* pEditText)
: EditBoxImplCommon(pEditText)
, _hotKeyIdCtrlA(0)
, _hwndEdit(NULL)
, _changedTextManually(false)
, _hasFocus(false)
Expand Down Expand Up @@ -101,10 +100,6 @@ void EditBoxImplWin::cleanupEditCtrl()
{
if (_hwndEdit)
{
UnregisterHotKey(_hwndEdit, _hotKeyIdCtrlA);
GlobalDeleteAtom(_hotKeyIdCtrlA);
_hotKeyIdCtrlA = 0;

SetWindowLongPtrW(_hwndEdit, GWLP_WNDPROC, (LONG_PTR)_prevWndProc);
::DestroyWindow(_hwndEdit);
_hasFocus = false;
Expand Down Expand Up @@ -137,9 +132,6 @@ void EditBoxImplWin::createEditCtrl(bool singleLine)
s_previousFocusWnd = s_hwndCocos;
this->setNativeFont(this->getNativeDefaultFontName(), this->_fontSize);
this->setNativeText(this->_text.c_str());

_hotKeyIdCtrlA = GlobalAddAtom(L"CTRL+A");
RegisterHotKey(_hwndEdit, _hotKeyIdCtrlA, MOD_CONTROL | MOD_NOREPEAT, 'A');
}
}

Expand Down Expand Up @@ -313,6 +305,12 @@ void EditBoxImplWin::_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa
{
switch (uMsg)
{
case WM_KEYDOWN:
if (_hasFocus && wParam == 'A' && (GetKeyState(VK_CONTROL) & 0x8000) != 0) // CTRL+A for "Select All"
{
::SendMessageW(_hwndEdit, EM_SETSEL, 0, -1);
}
break;
case WM_CHAR:
if (wParam == VK_RETURN)
{
Expand Down Expand Up @@ -369,12 +367,6 @@ void EditBoxImplWin::_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa
this->editBoxEditingDidEnd(this->getText(), _endAction);
}
break;
case WM_HOTKEY:
if (wParam == (WPARAM)_hotKeyIdCtrlA)
{
::SendMessageW(_hwndEdit, EM_SETSEL, 0, -1);
}
break;
default:
break;
}
Expand Down
1 change: 0 additions & 1 deletion core/ui/UIEditBox/UIEditBoxImpl-win32.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ class AX_GUI_DLL EditBoxImplWin : public EditBoxImplCommon
void _WindowProc(HWND, UINT, WPARAM, LPARAM);

WNDPROC _prevWndProc;
ATOM _hotKeyIdCtrlA;

static LRESULT CALLBACK WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
static LRESULT CALLBACK hookGLFWWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
Expand Down

0 comments on commit 1e8fbb9

Please sign in to comment.