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

improved AutoSizing for Parent controls

Browse Source 
git-svn-id: trunk@8636 -
This commit is contained in:
mattias 2006-01-27 20:36:32 +00:00
parent ca17afa6fd
commit 3c3ac6365a
4 changed files with 61 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lcl/controls.pp
View File

@ -101,7 +101,7 @@ type
TAnchorKind = (akTop, akLeft, akRight, akBottom);
TAnchors = set of TAnchorKind;
TAnchorSideReference = (asrTop, asrBottom, asrCenter);
const
asrLeft = asrTop;
asrRight = asrBottom;
@ -1106,6 +1106,7 @@ type
Raw: boolean = false); virtual;
procedure CNPreferredSizeChanged;
procedure InvalidatePreferredSize; virtual;
function GetBoundsDependingOnParent(WithNormalAnchors: Boolean): TAnchors;
procedure DisableAutoSizing;
procedure EnableAutoSizing;
procedure UpdateBaseBounds(StoreBounds, StoreParentClientSize,

3
lcl/include/bitbtn.inc
View File

@ -77,6 +77,7 @@ end;
Procedure TCustomBitBtn.SetGlyph(AValue: TBitmap);
Begin
FButtonGlyph.Glyph := AValue;
InvalidatePreferredSize;
AdjustSize;
end;
@ -84,6 +85,8 @@ procedure TCustomBitBtn.GlyphChanged(Sender: TObject);
begin
if HandleAllocated
then TWSBitBtnClass(WidgetSetClass).SetGlyph(Self, Glyph);
InvalidatePreferredSize;
AdjustSize;
end;
procedure TCustomBitBtn.ActionChange(Sender: TObject; CheckDefaults: Boolean);

24
lcl/include/control.inc
View File

@ -3652,6 +3652,30 @@ begin
end;
end;
function TControl.GetBoundsDependingOnParent(WithNormalAnchors: Boolean
): TAnchors;
var
a: TAnchorKind;
begin
Result:=[];
if Parent=nil then exit;
if (Anchors*[akLeft,akRight]=[]) then begin
// center horizontally
Result:=Result+[akLeft,akRight];
end;
for a:=Low(TAnchorKind) to High(TAnchorKind) do begin
if (a in Anchors) then begin
if WithNormalAnchors
or (AnchorSide[a].Control=Parent) then begin
// side anchored
Include(Result,a);
end;
end;
end;
end;
procedure TControl.DisableAutoSizing;
begin
inc(FAutoSizingLockCount);

73
lcl/include/wincontrol.inc
View File

@ -5646,53 +5646,44 @@ var
AControl: TControl;
ChildWidth,ChildHeight: integer;
a: TAnchorKind;
FixatedAnchors: TAnchors;
begin
ChildBounds := Rect(High(Integer),High(Integer),0,0);
SpaceAround:=Rect(0,0,0,0);
For I := 0 to ControlCount - 1 do begin
for I := 0 to ControlCount - 1 do begin
AControl:=Controls[I];
If AControl.IsControlVisible then begin
AControl.GetPreferredSize(ChildWidth,ChildHeight,false);
if WithBorderSpace then begin
AControl.BorderSpacing.GetSpaceAround(SpaceAround);
if SpaceAround.Left<ChildSizing.LeftRightSpacing then
SpaceAround.Left:=ChildSizing.LeftRightSpacing;
if SpaceAround.Right<ChildSizing.LeftRightSpacing then
SpaceAround.Right:=ChildSizing.LeftRightSpacing;
if SpaceAround.Top<ChildSizing.TopBottomSpacing then
SpaceAround.Top:=ChildSizing.TopBottomSpacing;
if SpaceAround.Bottom<ChildSizing.TopBottomSpacing then
SpaceAround.Bottom:=ChildSizing.TopBottomSpacing;
end;
With ChildBounds do begin
Left := Min(AControl.Left-SpaceAround.Left, Left);
Top := Min(AControl.Top-SpaceAround.Top, Top);
Right := Max(AControl.Left+ChildWidth+SpaceAround.Right,Right);
Bottom := Max(AControl.Top+ChildHeight+SpaceAround.Bottom,Bottom);
end;
if not AControl.IsControlVisible then continue;
FixatedAnchors:=GetBoundsDependingOnParent(false);
for a:=Low(TAnchorKind) to High(TAnchorKind) do
if a in FixatedAnchors then FixateSide(a);
if WithBorderSpace then begin
// check is a side of AControl is keeping distance to parent's side
// For example: if AControl.Align=alLeft, then AControl expands maximal
// to Left, Top and Bottom
if AControl.Align in [alLeft,alRight,alTop,alBottom,alClient] then begin
for a:=Low(TAnchorKind) to High(TAnchorKind) do begin
if a in AnchorAlign[AControl.Align] then
FixateSide(a);
end;
end;
for a:=Low(TAnchorKind) to High(TAnchorKind) do begin
if (a in AControl.Anchors)
and (AControl.AnchorSide[a].Control=Self) then begin
FixateSide(a);
end;
end;
end;
//DebugLn('TWinControl.GetChildBounds ',DbgSName(Self),' ChildBounds=',dbgs(ChildBounds),' ',DbgSName(AControl),'.BoundsRect=',dbgs(AControl.BoundsRect),' SpaceAround=',dbgs(SpaceAround));
if AControl.AutoSize then
AControl.GetPreferredSize(ChildWidth,ChildHeight,false)
else begin
ChildWidth:=AControl.Width;
ChildHeight:=AControl.Height;
end;
if WithBorderSpace then begin
AControl.BorderSpacing.GetSpaceAround(SpaceAround);
if SpaceAround.Left<ChildSizing.LeftRightSpacing then
SpaceAround.Left:=ChildSizing.LeftRightSpacing;
if SpaceAround.Right<ChildSizing.LeftRightSpacing then
SpaceAround.Right:=ChildSizing.LeftRightSpacing;
if SpaceAround.Top<ChildSizing.TopBottomSpacing then
SpaceAround.Top:=ChildSizing.TopBottomSpacing;
if SpaceAround.Bottom<ChildSizing.TopBottomSpacing then
SpaceAround.Bottom:=ChildSizing.TopBottomSpacing;
end;
with ChildBounds do begin
Left := Min(AControl.Left-SpaceAround.Left, Left);
Top := Min(AControl.Top-SpaceAround.Top, Top);
Right := Max(AControl.Left+ChildWidth+SpaceAround.Right,Right);
Bottom := Max(AControl.Top+ChildHeight+SpaceAround.Bottom,Bottom);
end;
//DebugLn('TWinControl.GetChildBounds ',DbgSName(Self),' ChildBounds=',dbgs(ChildBounds),' ',DbgSName(AControl),'.BoundsRect=',dbgs(AControl.BoundsRect),' SpaceAround=',dbgs(SpaceAround));
end;
if ChildBounds.Left>ChildBounds.Right then begin
ChildBounds.Left:=0;