From 0d8a8dff7dc150db1ce4a8536994fa642e9969ef Mon Sep 17 00:00:00 2001 From: Don Ho Date: Sat, 30 Sep 2023 01:17:24 +0200 Subject: [PATCH] Revert "Add recover search string feature after accessing search history" This reverts commit 1f3b0e6e4476a2783e78047dd9d6eac1d1117f8a due to the bug. --- .../src/ScintillaComponent/FindReplaceDlg.cpp | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp index 68b332c74..1ff7722b8 100644 --- a/PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp +++ b/PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp @@ -4170,8 +4170,6 @@ LRESULT FAR PASCAL FindReplaceDlg::comboEditProc(HWND hwnd, UINT message, WPARAM bool isDropped = ::SendMessage(hwndCombo, CB_GETDROPPEDSTATE, 0, 0) != 0; - static TCHAR draftString[FINDREPLACE_MAXLENGTH] = { '\0' }; - if (isDropped && (message == WM_KEYDOWN) && (wParam == VK_DELETE)) { auto curSel = ::SendMessage(hwndCombo, CB_GETCURSEL, 0, 0); @@ -4197,26 +4195,6 @@ LRESULT FAR PASCAL FindReplaceDlg::comboEditProc(HWND hwnd, UINT message, WPARAM delLeftWordInEdit(hwnd); 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(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(draftString)); - ::SendMessage(hwndCombo, CB_SETEDITSEL, 0, MAKELPARAM(0, -1)); - return 0; - - } return CallWindowProc(originalComboEditProc, hwnd, message, wParam, lParam); }