paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2026-01-04 18:50:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

LCL: TAutoSizeCtrlData.ComputePreferredClientArea: use 1 as default width/height

Browse Source 
git-svn-id: trunk@26284 -
This commit is contained in:
mattias 2010-06-24 17:34:17 +00:00
parent 36021d1c6e
commit d530a2cf9f
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lcl/include/controlscrollbar.inc
View File

@ -251,6 +251,8 @@ procedure TControlScrollBar.AutoCalcRange;
PreferredHeight: Integer;
begin
GetPreferredClientRect(PreferredWidth,PreferredHeight);
//if FControl.ClassName='TEditorCodetoolsOptionsFrame' then
// DebugLn(['AutoCalcHRange ',DbgSName(FControl),' AutoSize=',FControl.AutoSize,' Bounds=',dbgs(FControl.BoundsRect),' Client=',dbgs(FControl.ClientRect),' pref=',PreferredWidth,'x',PreferredHeight]);
InternalSetRange(PreferredWidth);
end;

8
lcl/include/wincontrol.inc
View File

@ -1031,13 +1031,14 @@ procedure TAutoSizeCtrlData.ComputePreferredClientArea(
if (not UseCurrentWidth) or (not UseCurrentHeight) then
Child.GetPreferredSize(CurPreferredWidth,CurPreferredHeight,true,true);
//if Child.Name='ToolTipBevel' then debugln(['InitPreferredSizes ',DbgSName(Child),' Bounds=',dbgs(Child.BoundsRect),' Anchors=',dbgs(Child.Anchors),' CurAnchors=',dbgs(CurAnchors),' UseW=',UseCurrentWidth,' UseH=',UseCurrentHeight,' Pref=',CurPreferredWidth,'x',CurPreferredHeight]);
if UseCurrentWidth then
NewWidth:=Child.Width
else if (CurPreferredWidth>0)
or ((CurPreferredWidth=0) and (csAutoSize0x0 in Child.ControlStyle)) then
NewWidth:=CurPreferredWidth
else
NewWidth:=Child.GetDefaultWidth;
NewWidth:=1;
NewWidth:=Child.Constraints.MinMaxWidth(NewWidth);
if UseCurrentHeight then
@ -1046,7 +1047,7 @@ procedure TAutoSizeCtrlData.ComputePreferredClientArea(
or ((CurPreferredHeight=0) and (csAutoSize0x0 in Child.ControlStyle)) then
NewHeight:=CurPreferredHeight
else
NewHeight:=Child.GetDefaultHeight;
NewHeight:=1;
NewHeight:=Child.Constraints.MinMaxHeight(NewHeight);
end else begin
NewWidth:=0;
@ -7766,7 +7767,8 @@ begin
Layout:=TAutoSizeCtrlData.Create(Self);
Layout.ComputePreferredClientArea(false,false,NewMoveLeft,NewMoveRight,
NewClientWidth,NewClientHeight);
//Layout.WriteDebugReport('TWinControl.CalculatePreferredSize ',' ');
if ClassName='TEditorCodetoolsOptionsFrame' then
Layout.WriteDebugReport('TWinControl.CalculatePreferredSize ',' ');
if (NewMoveLeft<>0) or (NewMoveRight<>0) then ;
finally
Layout.Free;