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

Re-enable possibility to center the FindReplaceDlg on Notepad++ main window 

* add goToCenter to hotkey check in IDM_SEARCH_(FIND|REPLACE|FINDINFILES|MARK)

Before commit aa69711d it was possible to center the dialog on Notepad++ using a second CTRL+F but was lost during the implementation of #10019, #10177.

This will re-add the function:
* When the hotkey used is not associated with the current tab, it will switch to the new tab (as before).
* If the hotkey used is associated with the current tab, it will center the FindReplaceDlg on Notepad++.

Fix #9201, close #11323
pull/11352/head
Daniel Fuchs 2022-03-02 12:11:20 +01:00 committed by Don Ho
parent a419b41ed5
commit 0affe35bc6
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1287,22 +1287,34 @@ intptr_t CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARA
return TRUE; return TRUE;
case IDM_SEARCH_FIND: case IDM_SEARCH_FIND:
enableReplaceFunc(false); // enable relace false so only find if (_currentStatus == FIND_DLG)
goToCenter();
else
enableReplaceFunc(false);
return TRUE; return TRUE;
case IDM_SEARCH_REPLACE: case IDM_SEARCH_REPLACE:
enableReplaceFunc(true); if (_currentStatus == REPLACE_DLG)
goToCenter();
else
enableReplaceFunc(true);
return TRUE; return TRUE;
case IDM_SEARCH_FINDINFILES: case IDM_SEARCH_FINDINFILES:
enableFindInFilesFunc(); if (_currentStatus == FINDINFILES_DLG)
goToCenter();
else
enableFindInFilesFunc();
return TRUE; return TRUE;
case IDM_SEARCH_MARK: case IDM_SEARCH_MARK:
enableMarkFunc(); if (_currentStatus == MARK_DLG)
goToCenter();
else
enableMarkFunc();
return TRUE; return TRUE;
case IDREPLACE : case IDREPLACE:
{ {
std::lock_guard<std::mutex> lock(findOps_mutex); std::lock_guard<std::mutex> lock(findOps_mutex);