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

[BUG_FIX] Correct SCEN_SETFOCUS handling: fixes Find in files stackoverflow due to inconsistent value of pEditView. Removes the previous workaround.

Browse Source 
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository@401 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
harrybharry 2009-01-23 15:51:09 +00:00
parent 048e3b9471
commit c57f952ea5
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
PowerEditor/src/Notepad_plus.cpp
View File

@ -1574,16 +1574,6 @@ bool Notepad_plus::findInFiles()
bool isInHiddenDir = _findReplaceDlg.isInHiddenDir(); bool isInHiddenDir = _findReplaceDlg.isInHiddenDir();
int nbTotal = 0; int nbTotal = 0;
// For unknown reason, find in files crashes
// when focus is on main view while cloned document is side by side.
// To avoid from crash, the temporary solution is set sub view as focused window
// WALKAROUND
if (_mainEditView.getCurrentBuffer()->getDocument() == _subEditView.getCurrentBuffer()->getDocument())
{
switchEditViewTo(SUB_VIEW);
}
// DNUORAKLAW
ScintillaEditView *pOldView = _pEditView; ScintillaEditView *pOldView = _pEditView;
_pEditView = &_invisibleEditView; _pEditView = &_invisibleEditView;
Document oldDoc = _invisibleEditView.execute(SCI_GETDOCPOINTER); Document oldDoc = _invisibleEditView.execute(SCI_GETDOCPOINTER);
@ -7316,7 +7306,16 @@ LRESULT Notepad_plus::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa
case WM_COMMAND: case WM_COMMAND:
if (HIWORD(wParam) == SCEN_SETFOCUS) if (HIWORD(wParam) == SCEN_SETFOCUS)
{ {
switchEditViewTo((lParam == (LPARAM)_mainEditView.getHSelf())?MAIN_VIEW:SUB_VIEW); HWND hMain = _mainEditView.getHSelf(), hSec = _subEditView.getHSelf();
HWND hFocus = (HWND)lParam;
if (hMain == hFocus)
switchEditViewTo(MAIN_VIEW);
else if (hSec == hFocus)
switchEditViewTo(SUB_VIEW);
else {
//Other Scintilla, ignore
}
return TRUE;
} }
else else
{ {