github-starred/ultimatepp
Watch
2
0
Fork
You've already forked ultimatepp
 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-10-06 00:30:10 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

CodeEditor: Find next now finds current selection if any #982

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8171 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-02-13 14:40:24 +00:00
commit 22383f7a4b
1 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

25
uppsrc/CodeEditor/FindReplace.cpp
View file

@ -602,10 +602,14 @@ void CodeEditor::FindReplace(bool pick_selection, bool pick_text, bool replace)
if(pick_text || pick_selection)
{
WString s = GetSelection().ToWString();
if(IsSelection()) {
if(s.Find('\n') < 0)
find_text = s;
int l, h;
GetSelection(l, h);
if(h - l < 100) {
find_text = GetSelectionW();
if(find_text.Find('\n') >= 0)
find_text.Clear();
}
}
else
if(pick_text) {
@ -837,8 +841,21 @@ void CodeEditor::SetFindReplaceData(const FindReplaceData& r)
void CodeEditor::FindPrevNext(bool prev)
{
if(!findreplace.IsOpen())
if(!findreplace.IsOpen()) {
WString find_text;
if(IsSelection()) {
int l, h;
GetSelection(l, h);
if(h - l < 100) {
find_text = GetSelectionW();
if(find_text.Find('\n') >= 0)
find_text.Clear();
}
}
if(find_text.GetCount())
findreplace.find <<= find_text;
OpenNormalFindReplace0(false);
}
if(Find(prev, false))
NoFindError();
else