From 9f86a5a31ff9ffedc0c354eeb98ee0828d646385 Mon Sep 17 00:00:00 2001 From: marc Date: Wed, 7 Apr 2004 22:20:40 +0000 Subject: [PATCH] Applied the idea of a patch from Darek Mazur git-svn-id: trunk@5378 - --- ide/uniteditor.pp | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/ide/uniteditor.pp b/ide/uniteditor.pp index bc8585c7f9..b8dfaa5163 100644 --- a/ide/uniteditor.pp +++ b/ide/uniteditor.pp @@ -3416,8 +3416,8 @@ End; //FindInFiles function TSourceNotebook.CreateFindInFilesDialog: TLazFindInFilesDialog; begin - Result:=TLazFindInFilesDialog.Create(Application); - LoadFindInFilesHistory(Result); + Result := TLazFindInFilesDialog.Create(Application); + LoadFindInFilesHistory(Result); end;//CreateFindInFilesDialog procedure TSourceNotebook.LoadFindInFilesHistory(ADialog: TLazFindInFilesDialog); @@ -3560,9 +3560,27 @@ begin end;//FIFCreateSearchForm Procedure TSourceNotebook.FindInFiles(AProject: TProject); +var + TempEditor: TSourceEditor; Begin - if FindInFilesDialog=nil then - FindInFilesDialog:=CreateFindInFilesDialog; + if FindInFilesDialog = nil + then FindInFilesDialog := CreateFindInFilesDialog; + + TempEditor := GetActiveSE; + if TempEditor <> nil + then with TempEditor, EditorComponent do + begin + if EditorOpts.FindTextAtCursor + then begin + if SelAvail and (BlockBegin.Y = BlockEnd.Y) + then FindInFilesDialog.FindText := SelText + else FindInFilesDialog.FindText := GetWordAtRowCol(CaretXY); + end + else begin + FindInFilesDialog.FindText:=''; + end; + end; + if FindInFilesDialog.ShowModal=mrOk then begin SaveFindInFilesHistory(FindInFilesDialog);