tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-27 15:54:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix unconsist "In select" behaviour in Find dialog

Browse Source 
ref: https://github.com/notepad-plus-plus/notepad-plus-plus/issues/14108#issuecomment-1719653099
This commit is contained in:
Don Ho 2023-09-26 01:35:49 +02:00
parent cb3c632444
commit 972329fb0c
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1495,37 +1495,23 @@ intptr_t CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARA
Sci_CharacterRangeFull cr = (*_ppEditView)->getSelection(); Sci_CharacterRangeFull cr = (*_ppEditView)->getSelection();
intptr_t nbSelected = cr.cpMax - cr.cpMin; intptr_t nbSelected = cr.cpMax - cr.cpMin;
_options._isInSelection = isCheckedOrNot(IDC_IN_SELECTION_CHECK)?1:0; _options._isInSelection = nbSelected >= FINDREPLACE_INSEL_TEXTSIZE_THRESHOLD;
int checkVal = _options._isInSelection?BST_CHECKED:BST_UNCHECKED;
if (!_options._isInSelection)
{
if (nbSelected <= FINDREPLACE_INSEL_TEXTSIZE_THRESHOLD)
{
checkVal = BST_UNCHECKED;
_options._isInSelection = false;
}
else
{
checkVal = BST_CHECKED;
_options._isInSelection = true;
}
}
// Searching/replacing in multiple selections or column selection is not allowed // Searching/replacing in multiple selections or column selection is not allowed
if (((*_ppEditView)->execute(SCI_GETSELECTIONMODE) == SC_SEL_RECTANGLE) || ((*_ppEditView)->execute(SCI_GETSELECTIONS) > 1)) if (((*_ppEditView)->execute(SCI_GETSELECTIONMODE) == SC_SEL_RECTANGLE) || ((*_ppEditView)->execute(SCI_GETSELECTIONS) > 1))
{ {
checkVal = BST_UNCHECKED;
_options._isInSelection = false; _options._isInSelection = false;
nbSelected = 0; nbSelected = 0;
} }
enableFindDlgItem(IDC_IN_SELECTION_CHECK, nbSelected != 0); enableFindDlgItem(IDC_IN_SELECTION_CHECK, nbSelected != 0);
// uncheck if the control is disable // uncheck if the control is disable
if (!nbSelected) if (!nbSelected)
{ {
checkVal = BST_UNCHECKED;
_options._isInSelection = false; _options._isInSelection = false;
} }
::SendDlgItemMessage(_hSelf, IDC_IN_SELECTION_CHECK, BM_SETCHECK, checkVal, 0); ::SendDlgItemMessage(_hSelf, IDC_IN_SELECTION_CHECK, BM_SETCHECK, _options._isInSelection ? BST_CHECKED : BST_UNCHECKED, 0);
} }
if (isCheckedOrNot(IDC_TRANSPARENT_LOSSFOCUS_RADIO)) if (isCheckedOrNot(IDC_TRANSPARENT_LOSSFOCUS_RADIO))