paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-08 07:21:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: Fixed components window closes but component does not appear in form. Issue #38706

Browse Source 
git-svn-id: trunk@64929 -
This commit is contained in:
michl 2021-04-05 16:27:49 +00:00
parent d0d6fcc053
commit fa42d863cd
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ide/componentlist.pas
View File

@ -95,7 +95,6 @@ type
PrevChangeStamp: Integer;
// List for Component inheritence view
FClassList: TStringListUTF8Fast;
FKeepSelected: Boolean;
FInitialized: Boolean;
FIgnoreSelection: Boolean;
FPageControlChange: Boolean;
@ -535,12 +534,8 @@ end;
procedure TComponentListForm.FormClose(Sender: TObject; var CloseAction: TCloseAction);
begin
if not FKeepSelected then
begin
ClearSelection;
IDEComponentPalette.Selected := Nil;
end;
FKeepSelected := False;
ClearSelection;
IDEComponentPalette.Selected := Nil;
end;
procedure TComponentListForm.FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
@ -564,17 +559,13 @@ begin
if AComponent=nil then
Exit;
if IsDocked or chbKeepOpen.Checked then
begin
OldFocusedControl := Screen.ActiveControl;
AddSelectedComponent;
if (OldFocusedControl<>nil) and OldFocusedControl.CanSetFocus then // AddComponent in docked mode steals focus to designer, get it back
OldFocusedControl.SetFocus;
end else
begin
FKeepSelected := True;
OldFocusedControl := Screen.ActiveControl;
AddSelectedComponent;
if (OldFocusedControl<>nil) and OldFocusedControl.CanSetFocus then // AddComponent in docked mode steals focus to designer, get it back
OldFocusedControl.SetFocus;
if not IsDocked and not chbKeepOpen.Checked then
Close;
end;
end;
procedure TComponentListForm.miCollapseAllClick(Sender: TObject);