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

implemented ChildSizing.Layout/EnlargeHorizontal/EnlargeVertical/ShrinkHorizontal/ShrinkVertical

Browse Source 
git-svn-id: trunk@8618 -
This commit is contained in:
mattias 2006-01-25 21:52:47 +00:00
parent 0fa64aa78b
commit 6c6535d395
1 changed files with 199 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

296
lcl/include/wincontrol.inc
View File

@ -54,8 +54,6 @@ type
Control. Control.
A TAutoSizeBoxcan can be a row or column. Then it has only one Childs array. A TAutoSizeBoxcan can be a row or column. Then it has only one Childs array.
A TAutoSizeBoxcan can be a table. Then it has both Childs arrays. A TAutoSizeBoxcan can be a table. Then it has both Childs arrays.
} }
TAutoSizeBox = class TAutoSizeBox = class
@ -71,26 +69,36 @@ type
Index: array[TAutoSizeBoxOrientation] of Integer; // index in parent or grandparent Index: array[TAutoSizeBoxOrientation] of Integer; // index in parent or grandparent
ChildCount: array[TAutoSizeBoxOrientation] of Integer; ChildCount: array[TAutoSizeBoxOrientation] of Integer;
Childs: array[TAutoSizeBoxOrientation] of PAutoSizeBox; Childs: array[TAutoSizeBoxOrientation] of PAutoSizeBox;
// for nodes
destructor Destroy; override;
procedure Clear;
procedure SetControl(AControl: TControl); procedure SetControl(AControl: TControl);
procedure ApplyChildsizingBorders(ChildSizing: TControlChildSizing);
// for rows and columns
procedure AllocateChildsArray(Orientation: TAutoSizeBoxOrientation; procedure AllocateChildsArray(Orientation: TAutoSizeBoxOrientation;
NewChildCount: Integer); NewChildCount: Integer);
procedure AllocateTable(ColCount, RowCount: Integer);
procedure SetTableControls(ListOfControls: TFPList;
ChildSizing: TControlChildSizing);
procedure ApplyChildsizingBorders(ChildSizing: TControlChildSizing);
procedure InitSums; procedure InitSums;
procedure SumLine(Orientation: TAutoSizeBoxOrientation; procedure SumLine(Orientation: TAutoSizeBoxOrientation;
DoInit: boolean); DoInit: boolean);
procedure SumTable;
procedure ComputeLeftTops(Orientation: TAutoSizeBoxOrientation); procedure ComputeLeftTops(Orientation: TAutoSizeBoxOrientation);
procedure ResizeChilds(ChildSizing: TControlChildSizing; procedure ResizeChilds(ChildSizing: TControlChildSizing;
Orientation: TAutoSizeBoxOrientation; Orientation: TAutoSizeBoxOrientation;
TargetSize: integer); TargetSize: integer);
// for tables
procedure AllocateTable(ColCount, RowCount: Integer);
procedure SetTableControls(ListOfControls: TFPList;
ChildSizing: TControlChildSizing);
procedure SumTable;
procedure ResizeTable(ChildSizing: TControlChildSizing; procedure ResizeTable(ChildSizing: TControlChildSizing;
TargetWidth, TargetHeight: integer); TargetWidth, TargetHeight: integer);
procedure SetTableControlBounds; function SetTableControlBounds(ChildSizing: TControlChildSizing): boolean;
function AlignControlsInTable(ListOfControls: TFPList;
ChildSizing: TControlChildSizing;
TargetWidth, TargetHeight: integer): boolean;
procedure WriteDebugReport; procedure WriteDebugReport;
destructor Destroy; override;
end; end;
const const
@ -201,12 +209,12 @@ begin
case ChildSizing.Layout of case ChildSizing.Layout of
cclLeftToRightThenTopToBottom: cclLeftToRightThenTopToBottom:
begin begin
ColCount:=ChildSizing.ControlsPerLine; ColCount:=Max(1,ChildSizing.ControlsPerLine);
RowCount:=((ListOfControls.Count-1) div ColCount)+1; RowCount:=((ListOfControls.Count-1) div ColCount)+1;
end; end;
cclTopToBottomThenLeftToRight: cclTopToBottomThenLeftToRight:
begin begin
RowCount:=ChildSizing.ControlsPerLine; RowCount:=Max(1,ChildSizing.ControlsPerLine);
ColCount:=((ListOfControls.Count-1) div RowCount)+1; ColCount:=((ListOfControls.Count-1) div RowCount)+1;
end; end;
else else
@ -449,8 +457,11 @@ var
ResizeableCount:=0; ResizeableCount:=0;
case EnlargeStyle of case EnlargeStyle of
crsScaleChilds,crsHomogenousChildResize: crsAnchorAligning:
exit; // no resizing
crsScaleChilds,crsHomogenousChildResize:
for i:=0 to ChildCount[Orientation]-1 do begin for i:=0 to ChildCount[Orientation]-1 do begin
Child:=Childs[Orientation][i]; Child:=Childs[Orientation][i];
if (Child.MaximumSize[Orientation]>0) if (Child.MaximumSize[Orientation]>0)
@ -502,10 +513,13 @@ var
Child: TAutoSizeBox; Child: TAutoSizeBox;
DiffSize: Integer; DiffSize: Integer;
NewSize: LongInt; NewSize: LongInt;
OldSize: LongInt;
begin begin
for i:=0 to ChildCount[Orientation]-1 do begin for i:=0 to ChildCount[Orientation]-1 do begin
if TargetSize=CurSize then break;
Child:=Childs[Orientation][i]; Child:=Childs[Orientation][i];
if (Child.MaximumSize[Orientation]>0) if (Child.MaximumSize[Orientation]<0)
and (Child.PreferredSize[Orientation]>=Child.MaximumSize[Orientation]) and (Child.PreferredSize[Orientation]>=Child.MaximumSize[Orientation])
then begin then begin
// this child can not be further enlarged // this child can not be further enlarged
@ -518,10 +532,10 @@ var
begin begin
// scale PreferredSize // scale PreferredSize
DiffSize:=TargetSize-CurSize; DiffSize:=TargetSize-CurSize;
NewSize:=Min(Max(1,round( OldSize:=Child.PreferredSize[Orientation];
Child.PreferredSize[Orientation]*Factor.Scale)), NewSize:=round(double(OldSize)*Factor.Scale);
DiffSize); NewSize:=Min(OldSize+DiffSize,Max(OldSize+1,NewSize));
inc(CurSize,NewSize-Child.PreferredSize[Orientation]); inc(CurSize,NewSize-OldSize);
Child.PreferredSize[Orientation]:=NewSize; Child.PreferredSize[Orientation]:=NewSize;
end; end;
@ -529,9 +543,9 @@ var
begin begin
// add to PreferredSize // add to PreferredSize
DiffSize:=TargetSize-CurSize; DiffSize:=TargetSize-CurSize;
NewSize:=Min(Child.PreferredSize[Orientation]+Factor.Offset, OldSize:=Child.PreferredSize[Orientation];
DiffSize); NewSize:=Min(OldSize+Factor.Offset,OldSize+DiffSize);
inc(CurSize,NewSize-Child.PreferredSize[Orientation]); inc(CurSize,NewSize-OldSize);
Child.PreferredSize[Orientation]:=NewSize; Child.PreferredSize[Orientation]:=NewSize;
end; end;
@ -540,16 +554,16 @@ var
if i=0 then begin if i=0 then begin
// add to left/top border // add to left/top border
DiffSize:=TargetSize-CurSize; DiffSize:=TargetSize-CurSize;
NewSize:=Min(Child.BorderLeftTop[Orientation]+Factor.Offset, OldSize:=Child.BorderLeftTop[Orientation];
DiffSize); NewSize:=Min(OldSize+Factor.Offset,OldSize+DiffSize);
inc(CurSize,NewSize-Child.BorderLeftTop[Orientation]); inc(CurSize,NewSize-OldSize);
Child.BorderLeftTop[Orientation]:=NewSize; Child.BorderLeftTop[Orientation]:=NewSize;
end; end;
// add to right/bottom border // add to right/bottom border
DiffSize:=TargetSize-CurSize; DiffSize:=TargetSize-CurSize;
NewSize:=Min(Child.BorderRightBottom[Orientation]+Factor.Offset, OldSize:=Child.BorderRightBottom[Orientation];
DiffSize); NewSize:=Min(OldSize+Factor.Offset,OldSize+DiffSize);
inc(CurSize,NewSize-Child.BorderRightBottom[Orientation]); inc(CurSize,NewSize-OldSize);
Child.BorderRightBottom[Orientation]:=NewSize; Child.BorderRightBottom[Orientation]:=NewSize;
if i<ChildCount[Orientation]-1 then if i<ChildCount[Orientation]-1 then
Child.BorderLeftTop[Orientation]:=NewSize; Child.BorderLeftTop[Orientation]:=NewSize;
@ -574,10 +588,14 @@ var
ResizeableCount:=0; ResizeableCount:=0;
case ShrinkStyle of case ShrinkStyle of
crsAnchorAligning:
exit; // no resizing
crsScaleChilds,crsHomogenousChildResize: crsScaleChilds,crsHomogenousChildResize:
for i:=0 to ChildCount[Orientation]-1 do begin for i:=0 to ChildCount[Orientation]-1 do begin
Child:=Childs[Orientation][i]; Child:=Childs[Orientation][i];
if (Child.PreferredSize[Orientation]<=Child.MinimumSize[Orientation]) if (Child.PreferredSize[Orientation]<=Child.MinimumSize[Orientation])
or (Child.PreferredSize[Orientation]<=1)
then begin then begin
// this child can not be further shrinked // this child can not be further shrinked
continue; continue;
@ -650,10 +668,12 @@ var
Child: TAutoSizeBox; Child: TAutoSizeBox;
DiffSize: Integer; DiffSize: Integer;
NewSize: LongInt; NewSize: LongInt;
OldSize: LongInt;
begin begin
for i:=0 to ChildCount[Orientation]-1 do begin for i:=0 to ChildCount[Orientation]-1 do begin
Child:=Childs[Orientation][i]; Child:=Childs[Orientation][i];
if (Child.PreferredSize[Orientation]<=Child.MinimumSize[Orientation]) if (Child.PreferredSize[Orientation]<=1)
or (Child.PreferredSize[Orientation]<=Child.MinimumSize[Orientation])
then begin then begin
// this child can not be further shrinked // this child can not be further shrinked
continue; continue;
@ -665,10 +685,10 @@ var
begin begin
// scale PreferredSize // scale PreferredSize
DiffSize:=CurSize-TargetSize; DiffSize:=CurSize-TargetSize;
NewSize:=Min(Max(1,round( OldSize:=Child.PreferredSize[Orientation];
Child.PreferredSize[Orientation]*Factor.Scale)), NewSize:=Min(round(OldSize*Factor.Scale),OldSize-1);
DiffSize); NewSize:=Max(Max(1,NewSize),OldSize-DiffSize);
dec(CurSize,Child.PreferredSize[Orientation]-NewSize); dec(CurSize,OldSize-NewSize);
Child.PreferredSize[Orientation]:=NewSize; Child.PreferredSize[Orientation]:=NewSize;
end; end;
@ -676,9 +696,10 @@ var
begin begin
// add to PreferredSize // add to PreferredSize
DiffSize:=CurSize-TargetSize; DiffSize:=CurSize-TargetSize;
NewSize:=Min(Child.PreferredSize[Orientation]-Factor.Offset, OldSize:=Child.PreferredSize[Orientation];
DiffSize); NewSize:=OldSize-Factor.Offset;
dec(CurSize,Child.PreferredSize[Orientation]-NewSize); NewSize:=Max(Max(NewSize,1),OldSize-DiffSize);
dec(CurSize,OldSize-NewSize);
Child.PreferredSize[Orientation]:=NewSize; Child.PreferredSize[Orientation]:=NewSize;
end; end;
@ -687,16 +708,16 @@ var
if i=0 then begin if i=0 then begin
// add to left/top border // add to left/top border
DiffSize:=CurSize-TargetSize; DiffSize:=CurSize-TargetSize;
NewSize:=Min(Max(0,Child.BorderLeftTop[Orientation]-Factor.Offset), OldSize:=Child.BorderLeftTop[Orientation];
DiffSize); NewSize:=Max(Max(0,OldSize-Factor.Offset),OldSize-DiffSize);
dec(CurSize,Child.BorderLeftTop[Orientation]-NewSize); dec(CurSize,OldSize-NewSize);
Child.BorderLeftTop[Orientation]:=NewSize; Child.BorderLeftTop[Orientation]:=NewSize;
end; end;
// add to right/bottom border // add to right/bottom border
DiffSize:=CurSize-TargetSize; DiffSize:=CurSize-TargetSize;
NewSize:=Min(Max(0,Child.BorderRightBottom[Orientation]-Factor.Offset), OldSize:=Child.BorderRightBottom[Orientation];
DiffSize); NewSize:=Max(Max(0,OldSize-Factor.Offset),OldSize-DiffSize);
dec(CurSize,Child.BorderRightBottom[Orientation]-NewSize); dec(CurSize,OldSize-NewSize);
Child.BorderRightBottom[Orientation]:=NewSize; Child.BorderRightBottom[Orientation]:=NewSize;
if i<ChildCount[Orientation]-1 then if i<ChildCount[Orientation]-1 then
Child.BorderLeftTop[Orientation]:=NewSize; Child.BorderLeftTop[Orientation]:=NewSize;
@ -709,8 +730,10 @@ var
var var
MaxResizeFactorPerItem, MinResizeFactorPerItem, CurScale: TResizeFactor; MaxResizeFactorPerItem, MinResizeFactorPerItem, CurScale: TResizeFactor;
ResizeableCount: integer; ResizeableCount: integer;
i: Integer;
begin begin
CurSize:=GetChildTotalSize; CurSize:=GetChildTotalSize;
//DebugLn('TAutoSizeBox.ResizeChilds CurSize=',dbgs(CurSize),' TargetSize=',dbgs(TargetSize));
EnlargeStyle:=crsAnchorAligning; EnlargeStyle:=crsAnchorAligning;
ShrinkStyle:=crsAnchorAligning; ShrinkStyle:=crsAnchorAligning;
if TargetSize>CurSize then begin if TargetSize>CurSize then begin
@ -719,6 +742,7 @@ begin
EnlargeStyle:=ChildSizing.EnlargeHorizontal EnlargeStyle:=ChildSizing.EnlargeHorizontal
else else
EnlargeStyle:=ChildSizing.EnlargeVertical; EnlargeStyle:=ChildSizing.EnlargeVertical;
i:=0;
while TargetSize>CurSize do begin while TargetSize>CurSize do begin
// shrink childs // shrink childs
GetChildMaxResize(MaxResizeFactorPerItem,ResizeableCount); GetChildMaxResize(MaxResizeFactorPerItem,ResizeableCount);
@ -736,6 +760,8 @@ begin
CurScale.Offset:=MaxResizeFactorPerItem.Offset; CurScale.Offset:=MaxResizeFactorPerItem.Offset;
EnlargeChilds(CurScale); EnlargeChilds(CurScale);
inc(i);
if i>1000 then RaiseGDBException('TAutoSizeBox.ResizeChilds consistency error');
end; end;
end else if TargetSize<CurSize then begin end else if TargetSize<CurSize then begin
// shrink // shrink
@ -743,9 +769,10 @@ begin
ShrinkStyle:=ChildSizing.ShrinkHorizontal ShrinkStyle:=ChildSizing.ShrinkHorizontal
else else
ShrinkStyle:=ChildSizing.ShrinkVertical; ShrinkStyle:=ChildSizing.ShrinkVertical;
while TargetSize>CurSize do begin i:=0;
while TargetSize<CurSize do begin
GetChildMinResize(MinResizeFactorPerItem,ResizeableCount); GetChildMinResize(MinResizeFactorPerItem,ResizeableCount);
if ResizeableCount=0 then break; if (ResizeableCount=0) or (MinResizeFactorPerItem.Offset=0) then break;
CurScale.Scale:=(double(TargetSize)/CurSize); CurScale.Scale:=(double(TargetSize)/CurSize);
if (MinResizeFactorPerItem.Scale>0) if (MinResizeFactorPerItem.Scale>0)
@ -759,6 +786,8 @@ begin
CurScale.Offset:=MinResizeFactorPerItem.Offset; CurScale.Offset:=MinResizeFactorPerItem.Offset;
ShrinkChilds(CurScale); ShrinkChilds(CurScale);
inc(i);
if i>1000 then RaiseGDBException('TAutoSizeBox.ResizeChilds consistency error');
end; end;
end; end;
ComputeLeftTops(Orientation); ComputeLeftTops(Orientation);
@ -772,7 +801,8 @@ begin
ResizeChilds(ChildSizing,asboVertical,TargetHeight); ResizeChilds(ChildSizing,asboVertical,TargetHeight);
end; end;
procedure TAutoSizeBox.SetTableControlBounds; function TAutoSizeBox.SetTableControlBounds(ChildSizing: TControlChildSizing
): boolean;
var var
y: Integer; y: Integer;
RowBox: TAutoSizeBox; RowBox: TAutoSizeBox;
@ -781,26 +811,80 @@ var
CellBox: TAutoSizeBox; CellBox: TAutoSizeBox;
CurControl: TControl; CurControl: TControl;
NewBounds: TRect; NewBounds: TRect;
CellBounds: TRect;
OldBounds: TRect;
NewWidth: LongInt;
NewHeight: LongInt;
begin begin
Result:=false;
//WriteDebugReport;
for y:=0 to ChildCount[asboVertical]-1 do begin for y:=0 to ChildCount[asboVertical]-1 do begin
RowBox:=Childs[asboVertical][y]; RowBox:=Childs[asboVertical][y];
for x:=0 to RowBox.ChildCount[asboHorizontal]-1 do begin for x:=0 to RowBox.ChildCount[asboHorizontal]-1 do begin
CellBox:=RowBox.Childs[asboHorizontal][x]; CellBox:=RowBox.Childs[asboHorizontal][x];
ColBox:=CellBox.Parent[asboVertical]; ColBox:=CellBox.Parent[asboVertical];
CurControl:=CellBox.Control; CurControl:=CellBox.Control;
NewBounds:=Bounds(ColBox.LeftTop[asboHorizontal], if CurControl=nil then continue;
RowBox.LeftTop[asboVertical], CellBounds:=Bounds(ColBox.LeftTop[asboHorizontal],
ColBox.PreferredSize[asboHorizontal], RowBox.LeftTop[asboVertical],
RowBox.PreferredSize[asboVertical]); ColBox.PreferredSize[asboHorizontal],
DebugLn('TAutoSizeBox.SetTableControlBounds Control=',DbgSName(CurControl),' NewBounds=',dbgs(NewBounds)); RowBox.PreferredSize[asboVertical]);
CurControl.SetBoundsKeepBase(ColBox.LeftTop[asboHorizontal], NewBounds.Left:=CellBounds.Left;
RowBox.LeftTop[asboVertical], NewBounds.Top:=CellBounds.Top;
ColBox.PreferredSize[asboHorizontal], NewWidth:=CellBox.PreferredSize[asboHorizontal];
RowBox.PreferredSize[asboVertical]); NewHeight:=CellBox.PreferredSize[asboVertical];
if (NewWidth<>ColBox.PreferredSize[asboHorizontal]) then begin
// column is bigger than preferred width of the control
if ChildSizing.EnlargeHorizontal
in [crsScaleChilds,crsHomogenousChildResize]
then
NewWidth:=CellBounds.Right-CellBounds.Left;
end else if (NewWidth>ColBox.PreferredSize[asboHorizontal]) then begin
// column is smaller than preferred width of the control
if ChildSizing.ShrinkHorizontal
in [crsScaleChilds,crsHomogenousChildResize]
then
NewWidth:=CellBounds.Right-CellBounds.Left;
end;
if (NewHeight<>ColBox.PreferredSize[asboVertical]) then begin
// column is bigger than preferred height of the control
if ChildSizing.EnlargeVertical
in [crsScaleChilds,crsHomogenousChildResize]
then
NewHeight:=CellBounds.Bottom-CellBounds.Top;
end else if (NewHeight>ColBox.PreferredSize[asboVertical]) then begin
// column is smaller than preferred height of the control
if ChildSizing.ShrinkVertical
in [crsScaleChilds,crsHomogenousChildResize]
then
NewHeight:=CellBounds.Bottom-CellBounds.Top;
end;
NewBounds.Right:=NewBounds.Left+NewWidth;
NewBounds.Bottom:=NewBounds.Top+NewHeight;
// TODO: align
OldBounds:=CurControl.BoundsRect;
if not CompareRect(@NewBounds,@OldBounds) then begin
//DebugLn('TAutoSizeBox.SetTableControlBounds Control=',DbgSName(CurControl),' CellBounds=',dbgs(CellBounds),' NewBounds=',dbgs(NewBounds));
Result:=true;
CurControl.SetBoundsKeepBase(NewBounds.Left,
NewBounds.Top,
NewBounds.Right-NewBounds.Left,
NewBounds.Bottom-NewBounds.Top);
end;
end; end;
end; end;
end; end;
function TAutoSizeBox.AlignControlsInTable(ListOfControls: TFPList;
ChildSizing: TControlChildSizing; TargetWidth, TargetHeight: integer): boolean;
begin
SetTableControls(ListOfControls,ChildSizing);
SumTable;
ResizeTable(ChildSizing,TargetWidth,TargetHeight);
Result:=SetTableControlBounds(ChildSizing);
end;
procedure TAutoSizeBox.WriteDebugReport; procedure TAutoSizeBox.WriteDebugReport;
var var
y: Integer; y: Integer;
@ -814,9 +898,9 @@ begin
for y:=0 to ChildCount[asboVertical]-1 do begin for y:=0 to ChildCount[asboVertical]-1 do begin
RowBox:=Childs[asboVertical][y]; RowBox:=Childs[asboVertical][y];
DbgOut(' Row='+dbgs(y), DbgOut(' Row='+dbgs(y),
' Min='+dbgs(RowBox.MinimumSize[asboVertical]), ' MinY='+dbgs(RowBox.MinimumSize[asboVertical]),
' Max='+dbgs(RowBox.MaximumSize[asboVertical]), ' MaxY='+dbgs(RowBox.MaximumSize[asboVertical]),
' Pref='+dbgs(RowBox.PreferredSize[asboVertical]), ' PrefY='+dbgs(RowBox.PreferredSize[asboVertical]),
' #Col='+dbgs(RowBox.ChildCount[asboHorizontal])); ' #Col='+dbgs(RowBox.ChildCount[asboHorizontal]));
for x:=0 to RowBox.ChildCount[asboHorizontal]-1 do begin for x:=0 to RowBox.ChildCount[asboHorizontal]-1 do begin
CellBox:=RowBox.Childs[asboHorizontal][x]; CellBox:=RowBox.Childs[asboHorizontal][x];
@ -843,12 +927,20 @@ end;
destructor TAutoSizeBox.Destroy; destructor TAutoSizeBox.Destroy;
var var
o: TAutoSizeBoxOrientation; o: TAutoSizeBoxOrientation;
i: Integer;
begin begin
// unlink from parent // unlink from parent
for o:=Low(TAutoSizeBoxOrientation) to high(TAutoSizeBoxOrientation) do for o:=Low(TAutoSizeBoxOrientation) to high(TAutoSizeBoxOrientation) do
if Parent[o]<>nil then if Parent[o]<>nil then
Parent[o].Childs[o][Index[o]]:=nil; Parent[o].Childs[o][Index[o]]:=nil;
Clear;
inherited Destroy;
end;
procedure TAutoSizeBox.Clear;
var
o: TAutoSizeBoxOrientation;
i: Integer;
begin
// free all childs // free all childs
for o:=Low(TAutoSizeBoxOrientation) to high(TAutoSizeBoxOrientation) do for o:=Low(TAutoSizeBoxOrientation) to high(TAutoSizeBoxOrientation) do
for i:=0 to ChildCount[o]-1 do for i:=0 to ChildCount[o]-1 do
@ -856,7 +948,6 @@ begin
// free childs arrays // free childs arrays
for o:=Low(TAutoSizeBoxOrientation) to high(TAutoSizeBoxOrientation) do for o:=Low(TAutoSizeBoxOrientation) to high(TAutoSizeBoxOrientation) do
ReallocMem(Childs[o],0); ReallocMem(Childs[o],0);
inherited Destroy;
end; end;
@ -1634,6 +1725,42 @@ procedure TWinControl.DoAutoSize;
Result:=Result+AnchorAlign[CurControl.Align]; Result:=Result+AnchorAlign[CurControl.Align];
end; end;
end; end;
function WidthAnchored(CurAnchors: TAnchors): boolean;
begin
Result:=(CurAnchors*[akLeft,akRight]=[akLeft,akRight]);
end;
function WidthDependsOnChilds: boolean;
begin
Result:=(ChildSizing.EnlargeHorizontal<>crsAnchorAligning)
or (ChildSizing.ShrinkHorizontal<>crsAnchorAligning);
end;
function WidthDependsOnParent: boolean;
begin
Result:=(Parent<>nil)
and ((Parent.ChildSizing.EnlargeHorizontal<>crsAnchorAligning)
or (Parent.ChildSizing.ShrinkHorizontal<>crsAnchorAligning));
end;
function HeightAnchored(CurAnchors: TAnchors): boolean;
begin
Result:=(CurAnchors*[akTop,akBottom]=[akTop,akBottom]);
end;
function HeightDependsOnChilds: boolean;
begin
Result:=(ChildSizing.EnlargeVertical<>crsAnchorAligning)
or (ChildSizing.ShrinkVertical<>crsAnchorAligning);
end;
function HeightDependsOnParent: boolean;
begin
Result:=(Parent<>nil)
and ((Parent.ChildSizing.EnlargeVertical<>crsAnchorAligning)
or (Parent.ChildSizing.ShrinkVertical<>crsAnchorAligning));
end;
var var
I : Integer; I : Integer;
@ -1669,12 +1796,12 @@ begin
if Align<>alNone then CurAnchors:=CurAnchors+AnchorAlign[Align]; if Align<>alNone then CurAnchors:=CurAnchors+AnchorAlign[Align];
ChildFixedSides:=FindChildFixatedSides; ChildFixedSides:=FindChildFixatedSides;
CurAnchors:=CurAnchors+ChildFixedSides; CurAnchors:=CurAnchors+ChildFixedSides;
WidthIsFixed:=(CurAnchors*[akLeft,akRight]=[akLeft,akRight]) WidthIsFixed:=WidthAnchored(CurAnchors)
or ((ChildSizing.EnlargeHorizontal<>crsAnchorAligning) or WidthDependsOnChilds
or (ChildSizing.ShrinkHorizontal<>crsAnchorAligning)); or WidthDependsOnParent;
HeightIsFixed:=(CurAnchors*[akTop,akBottom]=[akTop,akBottom]) HeightIsFixed:=HeightAnchored(CurAnchors)
or ((ChildSizing.EnlargeVertical<>crsAnchorAligning) or HeightDependsOnChilds
or (ChildSizing.ShrinkVertical<>crsAnchorAligning)); or HeightDependsOnParent;
// move childs tight to left and top (so no space left and above childs) // move childs tight to left and top (so no space left and above childs)
If (ControlCount > 0) then begin If (ControlCount > 0) then begin
@ -3966,58 +4093,33 @@ procedure TWinControl.AlignNonAlignedControls(ListOfControls: TFPList;
Example: Example:
cclLeftToRightThenTopToBottom cclLeftToRightThenTopToBottom
+-----------------------------------+ Block +-----------------------------------+
|+---------------------------------+| / |+---------------------------------+|
|| Control1 | Control2 | Control 3 ||/ || Control1 | Control2 | Control 3 ||
|+---------------------------------+| |+---------------------------------+|
|+---------------------------------+| |+---------------------------------+|
|| Control4 | Control5 | Control 6 |----Box/Line || Control4 | Control5 | Control 6 ||
|+---------------------------------+| |+---------------------------------+|
|+---------------------+ | |+---------------------+ |
|| Control7 | Control8 | | || Control7 | Control8 | |
|+---------------------+ | |+---------------------+ |
+-----------------------------------+ +-----------------------------------+
Block is the outer rectangle and contains an array of TBox.
Each box contains a list of controls.
} }
var var
BoxList: TFPList;
function CreateNewBox: TAutoSizeBox;
begin
Result:=TAutoSizeBox.Create;
BoxList.Add(Result);
end;
var
i: Integer;
Box: TAutoSizeBox; Box: TAutoSizeBox;
BigBox: TAutoSizeBox;
begin begin
// check if ChildSizing aligning is enabled // check if ChildSizing aligning is enabled
if (ChildSizing.Layout=cclNone) or (ListOfControls.Count=0) then if (ChildSizing.Layout=cclNone) or (ListOfControls.Count=0) then
exit; exit;
debugln('TWinControl.AlignNonAlignedControls ',DbgSName(Self),' ListOfControls.Count=',dbgs(ListOfControls.Count)); //debugln('TWinControl.AlignNonAlignedControls ',DbgSName(Self),' ListOfControls.Count=',dbgs(ListOfControls.Count));
BoxList:=TFPList.Create; Box:=TAutoSizeBox.Create;
try try
// allocate a box for every Control BoundsModified:=Box.AlignControlsInTable(ListOfControls,ChildSizing,
for i:=0 to ListOfControls.Count-1 do begin ClientWidth,ClientHeight);
Box:=CreateNewBox;
Box.SetControl(TControl(ListOfControls[i]));
end;
// allocate a box for the client area
BigBox:=CreateNewBox;
// TODO
BigBox.AllocateTable(1,1);
finally finally
for i:=0 to BoxList.Count-1 do TObject(BoxList[i]).Free; Box.Free;
BoxList.Free;
end; end;
end; end;