mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-31 04:42:11 +02:00
MG: fixed designer component deletion
git-svn-id: trunk@1962 -
This commit is contained in:
parent
c1da001b0f
commit
48cf639fb8
@ -264,6 +264,8 @@ Begin
|
||||
{$IFDEF VerboseDesigner}
|
||||
Writeln('[TDesigner.RemoveControl] C ',AComponent.Name,':',AComponent.ClassName);
|
||||
{$ENDIF}
|
||||
if not (AComponent is TControl) then
|
||||
Form.Invalidate;
|
||||
FFormEditor.DeleteControl(AComponent);
|
||||
end;
|
||||
|
||||
@ -505,7 +507,7 @@ Begin
|
||||
MouseDownSender:=nil;
|
||||
exit;
|
||||
end;
|
||||
|
||||
|
||||
ControlSelection.ActiveGrabber:=nil;
|
||||
RubberBandWasActive:=ControlSelection.RubberBandActive;
|
||||
|
||||
@ -544,17 +546,17 @@ Begin
|
||||
and (ControlSelection[0].Component is TCustomForm)) then
|
||||
ControlSelection.Clear;
|
||||
ControlSelection.SelectWithRubberBand(
|
||||
SenderParentForm,ssShift in Shift);
|
||||
Form,ssShift in Shift);
|
||||
if ControlSelection.Count=0 then
|
||||
ControlSelection.Add(SenderParentForm);
|
||||
ControlSelection.Add(Form);
|
||||
ControlSelection.RubberbandActive:=false;
|
||||
end else begin
|
||||
if (not (ssShift in Shift)) then begin
|
||||
ControlSelection.Clear;
|
||||
ControlSelection.Add(Sender);
|
||||
ControlSelection.Add(MouseDownComponent);
|
||||
end;
|
||||
end;
|
||||
SenderParentForm.Invalidate;
|
||||
Form.Invalidate;
|
||||
end;
|
||||
ControlSelection.EndUpdate;
|
||||
end else begin
|
||||
@ -563,7 +565,7 @@ Begin
|
||||
ControlSelection.BeginUpdate;
|
||||
|
||||
// find a parent for the new component
|
||||
NewParent:=TWinControl(Sender);
|
||||
NewParent:=TWinControl(MouseDownComponent);
|
||||
while (NewParent<>nil)
|
||||
and ((not (csAcceptsControls in NewParent.ControlStyle))
|
||||
or ((NewParent.Owner<>Form) and (NewParent<>Form)))
|
||||
|
Loading…
Reference in New Issue
Block a user