tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add recover search string feature after accessing search history 

Fix #14174, close #14187
This commit is contained in:
Cerno_b 2023-09-27 21:16:24 +02:00 committed by Don Ho
parent 7bbe4d1ff8
commit 1f3b0e6e44
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp
View File

@ -4170,6 +4170,8 @@ LRESULT FAR PASCAL FindReplaceDlg::comboEditProc(HWND hwnd, UINT message, WPARAM
bool isDropped = ::SendMessage(hwndCombo, CB_GETDROPPEDSTATE, 0, 0) != 0; bool isDropped = ::SendMessage(hwndCombo, CB_GETDROPPEDSTATE, 0, 0) != 0;
static TCHAR draftString[FINDREPLACE_MAXLENGTH] = { '\0' };
if (isDropped && (message == WM_KEYDOWN) && (wParam == VK_DELETE)) if (isDropped && (message == WM_KEYDOWN) && (wParam == VK_DELETE))
{ {
auto curSel = ::SendMessage(hwndCombo, CB_GETCURSEL, 0, 0); auto curSel = ::SendMessage(hwndCombo, CB_GETCURSEL, 0, 0);
@ -4195,6 +4197,26 @@ LRESULT FAR PASCAL FindReplaceDlg::comboEditProc(HWND hwnd, UINT message, WPARAM
delLeftWordInEdit(hwnd); delLeftWordInEdit(hwnd);
return 0; return 0;
} }
else if ((message == WM_KEYDOWN) && (wParam == VK_DOWN) && (::SendMessage(hwndCombo, CB_GETCURSEL, 0, 0) == CB_ERR))
{
// down key on unselected combobox item -> store current edit text as draft
::SendMessage(hwndCombo, WM_GETTEXT, FINDREPLACE_MAXLENGTH - 1, reinterpret_cast<LPARAM>(draftString));
}
else if ((message == WM_KEYDOWN) && (wParam == VK_UP) && (::SendMessage(hwndCombo, CB_GETCURSEL, 0, 0) == CB_ERR))
{
// up key on unselected combobox item -> no change but select current edit text
::SendMessage(hwndCombo, CB_SETEDITSEL, 0, MAKELPARAM(0, -1));
return 0;
}
else if ((message == WM_KEYDOWN) && (wParam == VK_UP) && (::SendMessage(hwndCombo, CB_GETCURSEL, 0, 0) == 0))
{
// up key on top selected combobox item -> restore draft to edit text
::SendMessage(hwndCombo, CB_SETCURSEL, WPARAM(-1), 0);
::SendMessage(hwndCombo, WM_SETTEXT, FINDREPLACE_MAXLENGTH - 1, reinterpret_cast<LPARAM>(draftString));
::SendMessage(hwndCombo, CB_SETEDITSEL, 0, MAKELPARAM(0, -1));
return 0;
}
return CallWindowProc(originalComboEditProc, hwnd, message, wParam, lParam); return CallWindowProc(originalComboEditProc, hwnd, message, wParam, lParam);
} }