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

LCL, CoolBar: Calculate text and control positions for bands in AlignControls method.

Browse Source 
git-svn-id: trunk@40148 -
This commit is contained in:
juha 2013-02-03 11:04:48 +00:00
parent 7745a4f174
commit 0e316db7a8
3 changed files with 42 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lcl/comctrls.pp
View File

@ -2186,6 +2186,7 @@ type
procedure SetFixedBackground(aValue: Boolean);
procedure SetColor(aValue: TColor);
procedure SetControlWidth;
procedure ResetControlProps;
procedure UpdControl;
procedure SetControl(aValue: TControl);
procedure SetParentColor(aValue: Boolean);
@ -2228,7 +2229,7 @@ type
FVisibleCount: Longword;
function GetItem(Index: Integer): TCoolBand;
procedure SetItem(Index: Integer; aValue: TCoolBand);
procedure CalcTops;
procedure UpdControls;
protected
function GetOwner: TPersistent; override;
procedure Update(aItem: TCollectionItem); override;
@ -2270,6 +2271,7 @@ type
procedure SetVertical(aValue: Boolean);
procedure ImageListChange(Sender: TObject);
protected
procedure AlignControls(aControl: TControl; var aRect: TRect); override;
procedure Notification(AComponent: TComponent; Operation: TOperation); override;
procedure Loaded; override;
procedure Paint; override;

68
lcl/include/coolbar.inc
View File

@ -82,6 +82,13 @@ begin
Result := FVisible and not (FCoolBar.Vertical and FHorizontalOnly);
end;
procedure TCoolBand.ResetControlProps;
begin
FControl.AnchorSide[akLeft].Control := Nil;
FControl.BorderSpacing.Left := 0;
FControl.Left := ControlPosLeft;
end;
procedure TCoolBand.SetBorderStyle(aValue: TBorderStyle);
begin
if FBorderStyle = aValue then Exit;
@ -172,9 +179,9 @@ begin
end;
if Assigned(FControl) then
begin
DebugLn('TCoolBand.UpdControl');
//DebugLn('TCoolBand.UpdControl');
// Calculate left positions and anchoring for text label and control
FControl.Align:=alNone;
FControl.Align := alNone;
FControl.Parent := FCoolBar;
FControl.FreeNotification(FCoolBar);
FControl.Top := FTop;
@ -184,11 +191,8 @@ begin
FControl.AnchorSide[akLeft].Side := asrRight;
FControl.BorderSpacing.Left := 7;
end
else begin
FControl.AnchorSide[akLeft].Control := Nil;
FControl.BorderSpacing.Left := 0;
FControl.Left := ControlPosLeft;
end;
else
ResetControlProps;
// Make sure other Anchors a Nil
FControl.AnchorSide[akRight].Control := Nil;
FControl.AnchorSide[akBottom].Control := Nil;
@ -202,11 +206,15 @@ var
Band: TCoolBand;
begin
if FControl = aValue then Exit;
DebugLn('TCoolBand.SetControl');
if Assigned(aValue) then begin
Band := TCoolBands(Collection).FindBand(aValue);
if Assigned(Band) and (Band <> Self) then
Band.SetControl(nil);
if Assigned(Band) and (Band <> Self) then begin
DebugLn(['TCoolBand.SetControl, removing old, FTop=', Band.FTop,
', FControl.Name=', Band.FControl.Name, ', FControl.ClassName=', Band.FControl.ClassName]);
Band.ResetControlProps;
Band.SetControl(nil); // Remove old association
end;
DebugLn(['TCoolBand.SetControl, adding new, aValue.Name=', aValue.Name, ', aValue.ClassName=', aValue.ClassName]);
end;
FControl := aValue;
Changed(True);
@ -249,7 +257,7 @@ begin
end
else begin
if Assigned(FTextLabel) then
FTextLabel.Free;
FreeAndNil(FTextLabel);
end;
Changed(True);
end;
@ -332,17 +340,7 @@ begin
inherited Update(aItem);
if FCoolBar = Nil then Exit;
if csDestroying in FCoolBar.ComponentState then Exit;
// Calculate left positions and anchoring for text and control
if Assigned(aItem) then begin // For defined item only
DebugLn(['TCoolBands.Update, Item Index', TCoolBand(aItem).Index]);
TCoolBand(aItem).UpdControl;
end
else begin // For all items
DebugLn('TCoolBands.Update, Item=Nil');
for i := 0 to Count-1 do
Items[i].UpdControl;
end;
CalcTops;
UpdControls; // Calculate control positions
end;
procedure TCoolBands.Notify(aItem: TCollectionItem; aAction: TCollectionNotification);
@ -374,27 +372,31 @@ begin
Result := nil;
for i := 0 to Count-1 do
begin
if GetItem(i).FControl = AControl then begin
if GetItem(i).FControl = AControl then
begin
Result := GetItem(i);
Exit;
end;
end;
end;
procedure TCoolBands.CalcTops;
// Calculate Top positions for controls. The value is cumulative and a loop must be used.
procedure TCoolBands.UpdControls;
var
i, hh, yy: Integer;
Band: TCoolBand;
begin
yy := 3;
for i := 0 to Count-1 do
begin
hh := Items[i].Height;
Assert(Assigned(FCoolBar), 'TCoolBands.CalcTops: FCoolBar is not assigned');
Band := Items[i];
hh := Band.Height;
if FCoolBar.BandBorderStyle = bsSingle then
Inc(hh, 2);
Items[i].FTop := yy;
//DebugLn(['TCoolBands.CalcTops, FTop=', Items[i].FTop]);
Band.FTop := yy;
Band.UpdControl; // Set control's location
//if Assigned(Band.FControl) then
// DebugLn(['TCoolBands.UpdControls, FTop=', Band.FTop,
// ', FControl.Name=', Band.FControl.Name, ', FControl.ClassName=', Band.FControl.ClassName]);
Inc(yy, hh+3);
end;
end;
@ -487,6 +489,12 @@ begin
Invalidate;
end;
procedure TCustomCoolBar.AlignControls(aControl: TControl; var aRect: TRect);
begin
FBands.UpdControls;
inherited AlignControls(aControl, aRect);
end;
procedure TCustomCoolBar.Notification(AComponent: TComponent; Operation: TOperation);
var
Band: TCoolBand;
@ -516,6 +524,7 @@ end;
procedure TCustomCoolBar.Loaded;
begin
inherited Loaded;
DebugLn('TCoolBar.Loaded');
FBands.Update(Nil);
end;
@ -524,7 +533,6 @@ var
i, BottomY: Integer;
begin
inherited Paint;
FBands.CalcTops;
for i := 0 to FBands.Count-1 do
begin
BottomY := FBands[i].FTop + FBands[i].Height + 1;

3
lcl/include/scrollingwincontrol.inc
View File

@ -70,8 +70,7 @@ begin
Result.Bottom := FVertScrollBar.Range;
end;
procedure TScrollingWinControl.AlignControls(AControl: TControl;
var ARect: TRect);
procedure TScrollingWinControl.AlignControls(AControl: TControl; var ARect: TRect);
begin
if AutoScroll then
begin