mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: Restore focus after exit from quick search (issue #2152)

Browse source 
(cherry picked from commit 788c934f43)
This commit is contained in:
Alexander Koblov 2025-02-09 15:05:28 +03:00
commit 15e166ecde
1 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/frames/fquicksearch.pas
View file

@ -80,6 +80,7 @@ type
procedure ClearFilter;
procedure CancelFilter;
procedure SetFocus(Data: PtrInt);
procedure RestoreFocus(Data: PtrInt);
procedure ProcessParams(const SearchMode: TQuickSearchMode; const Params: array of String);
public
LimitedAutoHide: Boolean;
@ -558,6 +559,18 @@ begin
if edtSearch.CanFocus then edtSearch.SetFocus;
end;
procedure TfrmQuickSearch.RestoreFocus(Data: PtrInt);
begin
if Assigned(Screen.ActiveControl) then
begin
// The file panel has lost focus
if Screen.ActiveControl is TCustomForm then
begin
if Parent.CanSetFocus then Parent.SetFocus;
end;
end;
end;
procedure TfrmQuickSearch.CheckFilesOrDirectoriesDown;
begin
if not (sbFiles.Down or sbDirectories.Down) then
@ -732,8 +745,10 @@ begin
if (Mode = qsFilter) and (edtSearch.Text <> EmptyStr) then
Self.Visible := DontHide or not gQuickFilterAutoHide
else
else begin
if DontHide then Reset else Finalize;
end;
Application.QueueAsyncCall(@RestoreFocus, 0);
Finalizing := False;
end;