From 0d411524c9701edef3618a0a9a8c003904fe89e1 Mon Sep 17 00:00:00 2001 From: Basile Burg Date: Tue, 22 Jan 2019 08:38:43 +0100 Subject: [PATCH] search & replace, ENTER execute the search or the replacement close #416 --- src/u_search.lfm | 2 ++ src/u_search.pas | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/src/u_search.lfm b/src/u_search.lfm index 7009d19c..8baa2ba9 100644 --- a/src/u_search.lfm +++ b/src/u_search.lfm @@ -28,6 +28,7 @@ inherited SearchWidget: TSearchWidget ItemHeight = 0 MaxLength = 128 OnChange = cbToFindChange + OnKeyDown = cbToFindKeyDown OnSelect = cbToFindChange TabOrder = 0 end @@ -203,6 +204,7 @@ inherited SearchWidget: TSearchWidget ItemHeight = 0 MaxLength = 128 OnChange = cbReplaceWthChange + OnKeyDown = cbReplaceWthKeyDown OnSelect = cbReplaceWthChange TabOrder = 1 end diff --git a/src/u_search.pas b/src/u_search.pas index 6a65cad1..783aa866 100644 --- a/src/u_search.pas +++ b/src/u_search.pas @@ -70,7 +70,11 @@ type Panel2: TPanel; procedure btnAllScopeClick(Sender: TObject); procedure cbReplaceWthChange(Sender: TObject); + procedure cbReplaceWthKeyDown(Sender: TObject; var Key: Word; + Shift: TShiftState); procedure cbToFindChange(Sender: TObject); + procedure cbToFindKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState + ); procedure chkEnableRepChange(Sender: TObject); private fDoc: TDexedMemo; @@ -610,6 +614,13 @@ begin updateImperative; end; +procedure TSearchWidget.cbToFindKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); +begin + if Key <> 13 then + exit; + actFindNextExecute(nil); +end; + procedure TSearchWidget.chkEnableRepChange(Sender: TObject); begin if Updating then exit; @@ -624,6 +635,14 @@ begin updateImperative; end; +procedure TSearchWidget.cbReplaceWthKeyDown(Sender: TObject; var Key: Word; + Shift: TShiftState); +begin + if Key <> 13 then + exit; + actReplaceNextExecute(nil); +end; + procedure TSearchWidget.btnAllScopeClick(Sender: TObject); begin case fFindScope of