pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

LazEdit: Fix loosing focus after closing Find/Replace dialog in some circumstanses.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2992 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
lazarus-bart
2014-05-02 22:37:43 +00:00
parent 246fc9e568
commit 42bf26f5f4
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/lazedit/main.lfm
View File

@ -14,7 +14,7 @@ object LazEditMainForm: TLazEditMainForm
OnDestroy = FormDestroy OnDestroy = FormDestroy
OnDropFiles = FormDropFiles OnDropFiles = FormDropFiles
OnShow = FormShow OnShow = FormShow
LCLVersion = '1.1' LCLVersion = '1.3'
object StatusBar: TStatusBar object StatusBar: TStatusBar
Left = 0 Left = 0
Height = 23 Height = 23
@ -1823,12 +1823,14 @@ object LazEditMainForm: TLazEditMainForm
end end
end end
object FindDialog: TFindDialog object FindDialog: TFindDialog
OnClose = FindReplaceDialogClose
Options = [frDown, frHideEntireScope] Options = [frDown, frHideEntireScope]
OnFind = DoFind OnFind = DoFind
left = 280 left = 280
top = 336 top = 336
end end
object ReplaceDialog: TReplaceDialog object ReplaceDialog: TReplaceDialog
OnClose = FindReplaceDialogClose
Options = [frDown, frReplace, frReplaceAll, frHideEntireScope] Options = [frDown, frReplace, frReplaceAll, frHideEntireScope]
OnFind = DoFind OnFind = DoFind
OnReplace = DoReplace OnReplace = DoReplace

6
applications/lazedit/main.pp
View File

@ -354,6 +354,7 @@ type
procedure acLayoutSubExecute(Sender: TObject); procedure acLayoutSubExecute(Sender: TObject);
procedure acLayoutSupExecute(Sender: TObject); procedure acLayoutSupExecute(Sender: TObject);
procedure acLayoutUnderlineExecute(Sender: TObject); procedure acLayoutUnderlineExecute(Sender: TObject);
procedure FindReplaceDialogClose(Sender: TObject);
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction); procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
procedure FormCloseQuery(Sender: TObject; var CanClose: boolean); procedure FormCloseQuery(Sender: TObject; var CanClose: boolean);
@ -1068,6 +1069,11 @@ begin
TryMarkSelection(underline_start, underline_end); TryMarkSelection(underline_start, underline_end);
end; end;
procedure TLazEditMainForm.FindReplaceDialogClose(Sender: TObject);
begin
Self.BringToFront;
end;
procedure TLazEditMainForm.acEditCopyExecute(Sender: TObject); procedure TLazEditMainForm.acEditCopyExecute(Sender: TObject);
begin begin
EditCopy; EditCopy;