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

Designer: Call DoDeletePersistent only once after deleting a control.

Browse Source 
git-svn-id: trunk@64132 -
This commit is contained in:
juha 2020-11-13 21:47:17 +00:00
parent c319bc8947
commit 6fa295d5e4
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/ideintf/componenttreeview.pas
View File

@ -67,8 +67,8 @@ type
constructor Create(TheOwner: TComponent); override;
destructor Destroy; override;
procedure DragDrop(Source: TObject; X, Y: Integer); override;
procedure RebuildComponentNodes; virtual;
procedure UpdateComponentNodesValues; virtual;
procedure RebuildComponentNodes;
procedure UpdateComponentNodesValues;
public
ImgIndexForm: Integer;
ImgIndexComponent: Integer;

25
designer/designer.pp
View File

@ -79,12 +79,13 @@ type
TDesignerFlag = (
dfHasSized,
dfNeedPainting,
dfDuringPaintControl,
dfDuringDeletePers,
dfDestroyingForm,
dfShowEditorHints,
dfShowComponentCaptions,
dfShowNonVisualComponents,
dfDestroyingForm,
dfNeedPainting
dfShowNonVisualComponents
);
TDesignerFlags = set of TDesignerFlag;
@ -2992,6 +2993,7 @@ var
Hook: TPropertyEditorHook;
begin
if APersistent=nil then exit;
Include(FFlags, dfDuringDeletePers);
try
//debugln(['TDesigner.DoDeletePersistent A ',dbgsName(APersistent),' FreeIt=',FreeIt]);
// unselect component
@ -3019,15 +3021,16 @@ begin
TheFormEditor.DeleteComponent(TComponent(APersistent),FreeIt)
else if FreeIt then
APersistent.Free;
// call ComponentDeleted handler
if Assigned(FOnPersistentDeleted) then
FOnPersistentDeleted(Self,APersistent);
if Hook<>nil then
Hook.PersistentDeleted;
finally
// unmark component
DeletingPersistent.Remove(APersistent);
Exclude(FFlags, dfDuringDeletePers);
end;
// call ComponentDeleted handler
if Assigned(FOnPersistentDeleted) then
FOnPersistentDeleted(Self,APersistent);
if Hook<>nil then
Hook.PersistentDeleted;
end;
function TDesigner.GetSelectedComponentClass: TRegisteredComponent;
@ -3170,7 +3173,11 @@ begin
{$IFDEF VerboseDesigner}
DebugLn('[TDesigner.Notification] opRemove ',dbgsName(AComponent));
{$ENDIF}
DoDeletePersistent(AComponent,false);
Assert(dfDuringDeletePers in FFlags,
'TDesigner.Notification: opRemove for '+dbgsName(AComponent)+' from outside.');
// Notification is always(?) triggered with TheFormEditor.DeleteComponent()
// in DoDeletePersistent. Don't call it again.
//DoDeletePersistent(AComponent,false);
end;
end;