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

LCL: ChildSizing, fix computation of MaxWidth/Heigh for cells

Browse Source
This commit is contained in:
Martin 2024-03-22 15:42:20 +01:00
parent 3caf5b699b
commit 65809d7515
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lcl/include/wincontrol.inc
View File

@ -1653,10 +1653,13 @@ var
CurChild: TAutoSizeBox; CurChild: TAutoSizeBox;
CurBorder: integer; CurBorder: integer;
LastChild: TAutoSizeBox; LastChild: TAutoSizeBox;
HasChildWithoutMax: array [TAutoSizeBoxOrientation] of Boolean;
begin begin
if DoInit then InitSums; if DoInit then InitSums;
Orthogonal:=SizeBoxOrthogonal[Orientation]; Orthogonal:=SizeBoxOrthogonal[Orientation];
if ChildCount[Orientation]>0 then begin if ChildCount[Orientation]>0 then begin
HasChildWithoutMax[asboHorizontal] := False;
HasChildWithoutMax[asboVertical] := False;
for i:=0 to ChildCount[Orientation]-1 do begin for i:=0 to ChildCount[Orientation]-1 do begin
CurChild:=Children[Orientation][i]; CurChild:=Children[Orientation][i];
@ -1671,22 +1674,28 @@ begin
inc(MinimumSize[Orientation],CurBorder); inc(MinimumSize[Orientation],CurBorder);
inc(PreferredSize[Orientation],CurBorder); inc(PreferredSize[Orientation],CurBorder);
// add item size in Orientation // add item size in Orientation
if MaximumSize[Orientation]>0 then begin if not HasChildWithoutMax[Orientation] then begin
if CurChild.MaximumSize[Orientation]>0 then if CurChild.MaximumSize[Orientation]>0 then begin
inc(MaximumSize[Orientation],CurChild.MaximumSize[Orientation]) inc(MaximumSize[Orientation],CurChild.MaximumSize[Orientation]);
else end
else begin
MaximumSize[Orientation]:=0; MaximumSize[Orientation]:=0;
HasChildWithoutMax[Orientation] := True;
end;
end; end;
inc(MinimumSize[Orientation],CurChild.MinimumSize[Orientation]); inc(MinimumSize[Orientation],CurChild.MinimumSize[Orientation]);
inc(PreferredSize[Orientation],CurChild.PreferredSize[Orientation]); inc(PreferredSize[Orientation],CurChild.PreferredSize[Orientation]);
// maximize in Orthogonal // maximize in Orthogonal
if MaximumSize[Orthogonal]>0 then begin if not HasChildWithoutMax[Orthogonal] then begin
if CurChild.MaximumSize[Orthogonal]>0 then if CurChild.MaximumSize[Orthogonal]>0 then begin
MaximumSize[Orthogonal]:=Max(MaximumSize[Orthogonal], MaximumSize[Orthogonal]:=Max(MaximumSize[Orthogonal],
CurChild.MaximumSize[Orthogonal]) CurChild.MaximumSize[Orthogonal]);
else end
else begin
MaximumSize[Orthogonal]:=0; MaximumSize[Orthogonal]:=0;
HasChildWithoutMax[Orthogonal] := True;
end;
end; end;
MinimumSize[Orthogonal]:=Max(MinimumSize[Orthogonal], MinimumSize[Orthogonal]:=Max(MinimumSize[Orthogonal],
CurChild.MinimumSize[Orthogonal]); CurChild.MinimumSize[Orthogonal]);