Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Search result's text direction not always synchronized with main edit zone's one issue

Browse Source
This commit is contained in:
Don HO 2020-12-13 15:29:56 +01:00
parent 5e96dd0166
commit 241393407c
No known key found for this signature in database
GPG Key ID: 6C429F1D8D84F46E
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
View File

@ -2360,9 +2360,8 @@ void FindReplaceDlg::findAllIn(InWhat op)
_pFinder->init(_hInst, (*_ppEditView)->getHParent(), _ppEditView); _pFinder->init(_hInst, (*_ppEditView)->getHParent(), _ppEditView);
_pFinder->setVolatiled(false); _pFinder->setVolatiled(false);
bool isRTL = (*_ppEditView)->isTextDirectionRTL();
tTbData data = {0}; tTbData data = {0};
_pFinder->create(&data, isRTL); _pFinder->create(&data);
::SendMessage(_hParent, NPPM_MODELESSDIALOG, MODELESSDIALOGREMOVE, reinterpret_cast<LPARAM>(_pFinder->getHSelf())); ::SendMessage(_hParent, NPPM_MODELESSDIALOG, MODELESSDIALOGREMOVE, reinterpret_cast<LPARAM>(_pFinder->getHSelf()));
// define the default docking behaviour // define the default docking behaviour
data.uMask = DWS_DF_CONT_BOTTOM | DWS_ICONTAB | DWS_ADDINFO; data.uMask = DWS_DF_CONT_BOTTOM | DWS_ICONTAB | DWS_ADDINFO;
@ -2387,7 +2386,6 @@ void FindReplaceDlg::findAllIn(InWhat op)
::SendMessage(_hParent, NPPM_DMMREGASDCKDLG, 0, reinterpret_cast<LPARAM>(&data)); ::SendMessage(_hParent, NPPM_DMMREGASDCKDLG, 0, reinterpret_cast<LPARAM>(&data));
_pFinder->_scintView.init(_hInst, _pFinder->getHSelf()); _pFinder->_scintView.init(_hInst, _pFinder->getHSelf());
_pFinder->_scintView.changeTextDirection(isRTL);
// Subclass the ScintillaEditView for the Finder (Scintilla doesn't notify all key presses) // Subclass the ScintillaEditView for the Finder (Scintilla doesn't notify all key presses)
originalFinderProc = SetWindowLongPtr(_pFinder->_scintView.getHSelf(), GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(finderProc)); originalFinderProc = SetWindowLongPtr(_pFinder->_scintView.getHSelf(), GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(finderProc));
@ -2456,6 +2454,8 @@ void FindReplaceDlg::findAllIn(InWhat op)
generic_string text = _pFinder->getHitsString(_findAllResult); generic_string text = _pFinder->getHitsString(_findAllResult);
wsprintf(_findAllResultStr, text.c_str()); wsprintf(_findAllResultStr, text.c_str());
bool isRTL = (*_ppEditView)->isTextDirectionRTL();
_pFinder->_scintView.changeTextDirection(isRTL);
if (_findAllResult) if (_findAllResult)
{ {
focusOnFinder(); focusOnFinder();