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

Make 'Clear all marks' respect 'In selection' choice

Browse Source 
Fix #6271, close #7636
This commit is contained in:
Scott Sumner 2019-11-21 10:42:06 -05:00 committed by Don HO
parent dc48cee5f7
commit 90176b21ae
No known key found for this signature in database
GPG Key ID: 6C429F1D8D84F46E
2 changed files with 42 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1366,12 +1366,7 @@ INT_PTR CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM
if (_currentStatus == MARK_DLG) if (_currentStatus == MARK_DLG)
{ {
if (isMacroRecording) saveInMacro(wParam, FR_OP_FIND); if (isMacroRecording) saveInMacro(wParam, FR_OP_FIND);
(*_ppEditView)->clearIndicator(SCE_UNIVERSAL_FOUND_STYLE); clearMarks(_options);
if (_options._doMarkLine)
{
(*_ppEditView)->execute(SCI_MARKERDELETEALL, MARK_BOOKMARK);
}
setStatusbarMessage(TEXT(""), FSNoMessage);
} }
} }
return TRUE; return TRUE;
@ -2579,6 +2574,7 @@ void FindReplaceDlg::saveInMacro(size_t cmd, int cmdType)
if (cmd == IDC_CLEAR_ALL) if (cmd == IDC_CLEAR_ALL)
{ {
booleans = _options._doMarkLine ? IDF_MARKLINE_CHECK : 0; booleans = _options._doMarkLine ? IDF_MARKLINE_CHECK : 0;
booleans |= _options._isInSelection ? IDF_IN_SELECTION_CHECK : 0;
} }
::SendMessage(_hParent, WM_FRSAVE_INT, IDC_FRCOMMAND_BOOLEANS, booleans); ::SendMessage(_hParent, WM_FRSAVE_INT, IDC_FRCOMMAND_BOOLEANS, booleans);
::SendMessage(_hParent, WM_FRSAVE_INT, IDC_FRCOMMAND_EXEC, cmd); ::SendMessage(_hParent, WM_FRSAVE_INT, IDC_FRCOMMAND_EXEC, cmd);
@ -2811,12 +2807,7 @@ void FindReplaceDlg::execSavedCommand(int cmd, uptr_t intValue, const generic_st
case IDC_CLEAR_ALL: case IDC_CLEAR_ALL:
{ {
(*_ppEditView)->clearIndicator(SCE_UNIVERSAL_FOUND_STYLE); clearMarks(*_env);
if (_env->_doMarkLine)
{
(*_ppEditView)->execute(SCI_MARKERDELETEALL, MARK_BOOKMARK);
}
setStatusbarMessage(TEXT(""), FSNoMessage);
break; break;
} }
@ -2838,6 +2829,44 @@ void FindReplaceDlg::execSavedCommand(int cmd, uptr_t intValue, const generic_st
} }
} }
void FindReplaceDlg::clearMarks(const FindOption& opt)
{
if (opt._isInSelection)
{
Sci_CharacterRange cr = (*_ppEditView)->getSelection();
int startPosition = cr.cpMin;
int endPosition = cr.cpMax;
(*_ppEditView)->execute(SCI_SETINDICATORCURRENT, SCE_UNIVERSAL_FOUND_STYLE);
(*_ppEditView)->execute(SCI_INDICATORCLEARRANGE, startPosition, endPosition);
if (opt._doMarkLine)
{
auto lineNumber = (*_ppEditView)->execute(SCI_LINEFROMPOSITION, startPosition);
auto lineNumberEnd = (*_ppEditView)->execute(SCI_LINEFROMPOSITION, endPosition - 1);
for (auto i = lineNumber; i <= lineNumberEnd; ++i)
{
auto state = (*_ppEditView)->execute(SCI_MARKERGET, i);
if (state & (1 << MARK_BOOKMARK))
(*_ppEditView)->execute(SCI_MARKERDELETE, i, MARK_BOOKMARK);
}
}
}
else
{
(*_ppEditView)->clearIndicator(SCE_UNIVERSAL_FOUND_STYLE);
if (opt._doMarkLine)
{
(*_ppEditView)->execute(SCI_MARKERDELETEALL, MARK_BOOKMARK);
}
}
setStatusbarMessage(TEXT(""), FSNoMessage);
}
void FindReplaceDlg::setFindInFilesDirFilter(const TCHAR *dir, const TCHAR *filters) void FindReplaceDlg::setFindInFilesDirFilter(const TCHAR *dir, const TCHAR *filters)
{ {
if (dir) if (dir)

1
PowerEditor/src/ScitillaComponent/FindReplaceDlg.h
View File

@ -330,6 +330,7 @@ public :
}; };
void execSavedCommand(int cmd, uptr_t intValue, const generic_string& stringValue); void execSavedCommand(int cmd, uptr_t intValue, const generic_string& stringValue);
void clearMarks(const FindOption& opt);
void setStatusbarMessage(const generic_string & msg, FindStatus staus); void setStatusbarMessage(const generic_string & msg, FindStatus staus);
Finder * createFinder(); Finder * createFinder();
bool removeFinder(Finder *finder2remove); bool removeFinder(Finder *finder2remove);