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

LCL, CoolBar: add a new band when a component is dropped on Coolbar. Use OnIdle handler to delay setting the control's properties.

Browse Source 
git-svn-id: trunk@40149 -
This commit is contained in:
juha 2013-02-03 11:04:57 +00:00
parent 0e316db7a8
commit 7f287a7a36
2 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lcl/comctrls.pp
View File

@ -2261,6 +2261,8 @@ type
FImageChangeLink: TChangeLink;
FShowText: Boolean;
FVertical: Boolean;
FNewBand: TCoolBand;
FNewControl: TControl;
FOnChange: TNotifyEvent;
function GetAlign: TAlign;
procedure SetAlign(aValue: TAlign); reintroduce;
@ -2270,6 +2272,7 @@ type
procedure SetShowText(aValue: Boolean);
procedure SetVertical(aValue: Boolean);
procedure ImageListChange(Sender: TObject);
procedure OnIdle(Sender: TObject; var Done: Boolean);
protected
procedure AlignControls(aControl: TControl; var aRect: TRect); override;
procedure Notification(AComponent: TComponent; Operation: TOperation); override;

47
lcl/include/coolbar.inc
View File

@ -495,28 +495,53 @@ begin
inherited AlignControls(aControl, aRect);
end;
procedure TCustomCoolBar.OnIdle(Sender: TObject; var Done: Boolean);
begin
Assert(Assigned(FNewBand) and Assigned(FNewControl),
'TCoolBar.OnIdle: FNewBand or FNewControl not assigned');
FNewBand.Control := FNewControl;
Application.RemoveOnIdleHandler(@OnIdle);
FNewBand := Nil;
FNewControl := Nil;
end;
procedure TCustomCoolBar.Notification(AComponent: TComponent; Operation: TOperation);
var
Band: TCoolBand;
s: String;
begin
inherited Notification(AComponent, Operation);
if csDestroying in ComponentState then Exit;
case Operation of
opInsert: begin
DebugLn('TCoolBar.Notification: Operation = opInsert');
if AComponent is TWinControl then
begin
s := ', Comp=' + AComponent.Name + ', class=' + AComponent.ClassName;
if csLoading in ComponentState then
DebugLn('TCoolBar.Notification: Operation = opInsert, Loading' + s)
else begin
DebugLn('TCoolBar.Notification: Operation = opInsert, not Loading' + s);
if AComponent <> Self then
begin
// Delay setting the new control's properties by using OnIdle handler.
// Setting them directly in this Notification procedure leads to a crash.
FNewBand := FBands.Add;
FNewControl := TControl(AComponent);
Application.AddOnIdleHandler(@OnIdle);
end;
end;
end;
end;
opRemove: begin
DebugLn('TCoolBar.Notification: Operation = opRemove');
if not (csDestroying in ComponentState) then
if AComponent is TWinControl then
begin
if AComponent is TWinControl then
begin
Band := Bands.FindBand(TControl(AComponent));
if Band <> nil then
Band.FControl := nil;
end
else if AComponent = FImages then
Images := nil;
end;
Band := Bands.FindBand(TControl(AComponent));
if Assigned(Band) then
Band.FControl := nil;
end
else if AComponent = FImages then
Images := nil;
end;
end;
end;