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

lcl: fix some autosize problems

Browse Source 
git-svn-id: trunk@18501 -
This commit is contained in:
paul 2009-01-30 07:44:06 +00:00
parent 2927d73fba
commit 983e3633ec
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lcl/include/custompanel.inc
View File

@ -57,7 +57,6 @@ end;
procedure TCustomPanel.UpdateBordersAndBevels;
begin
InvalidateClientRectCache(True);
DoAdjustClientRectChange;
Invalidate;
end;

20
lcl/include/wincontrol.inc
View File

@ -3312,19 +3312,22 @@ end;
and calls AlignControl(nil) on change.
-------------------------------------------------------------------------------}
procedure TWinControl.DoAdjustClientRectChange;
var r: TRect;
var
R: TRect;
begin
r:=GetClientRect;
AdjustClientRect(r);
InvalidateClientRectCache(True);
R := GetClientRect;
AdjustClientRect(R);
//DebugLn(['TWinControl.DoAdjustClientRectChange ',DbgSName(Self),' ',r.Right,',',r.Bottom,' ',CompareRect(@r,@FAdjustClientRectRealized)]);
if not CompareRect(@r,@FAdjustClientRectRealized) then begin
if not CompareRect(@R, @FAdjustClientRectRealized) then
begin
// client rect changed since last AlignControl
{$IFDEF VerboseClientRectBugFix}
DebugLn('UUU TWinControl.DoAdjustClientRectChange ClientRect changed ',Name,':',ClassName,
' Old=',Dbgs(FAdjustClientRectRealized.Right),'x',DbgS(FAdjustClientRectRealized.Bottom),
' New=',DbgS(r.Right),'x',DbgS(r.Bottom));
{$ENDIF}
FAdjustClientRectRealized:=r;
FAdjustClientRectRealized := R;
ReAlign;
Resize;
AdjustSize;
@ -6215,7 +6218,7 @@ begin
{$ENDIF}
NewLeft:=Left;
NewTop:=Top;
if (Message.SizeType and Size_SourceIsInterface)>0 then
if (Message.SizeType and Size_SourceIsInterface) > 0 then
begin
// interface widget has resized
// -> update position and realized bounds
@ -6234,6 +6237,10 @@ begin
SetBoundsKeepBase(NewLeft,NewTop,Message.Width,Message.Height,Parent<>nil);
if ClientRectNeedsInterfaceUpdate then
DoAdjustClientRectChange;
if ((Message.SizeType and Size_SourceIsInterface) > 0) and
(Parent <> nil) and Parent.AutoSize then
Parent.AdjustSize;
end;
{------------------------------------------------------------------------------
@ -6567,7 +6574,6 @@ begin
//debugln('TWinControl.CreateWnd ',DbgSName(Self));
Constraints.UpdateInterfaceConstraints;
InvalidateClientRectCache(False);
InvalidatePreferredSize;
TWSWinControlClass(WidgetSetClass).ConstraintsChange(Self);
//WriteClientRect('A');

1
lcl/interfaces/qt/qtwidgets.pas
View File

@ -2505,7 +2505,6 @@ begin
if (NewSize.cx <> LCLObject.Width) or (NewSize.cy <> LCLObject.Height) or
(LCLObject.ClientRectNeedsInterfaceUpdate) then
begin
LCLObject.InvalidateClientRectCache(true);
LCLObject.DoAdjustClientRectChange;
end;

1
lcl/interfaces/win32/win32callback.inc
View File

@ -2343,7 +2343,6 @@ begin
if (lWinControl.Width<>Width) or (lWinControl.Height<>Height)
or lWinControl.ClientRectNeedsInterfaceUpdate then
begin
lWinControl.InvalidateClientRectCache(true);
lWinControl.DoAdjustClientRectChange;
if (lWinControl is TCustomPage)
and (lWinControl.Parent is TCustomNotebook) then

1
lcl/interfaces/wince/wincecallback.inc
View File

@ -1976,7 +1976,6 @@ begin
if (lWinControl.Width<>Width) or (lWinControl.Height<>Height)
or lWinControl.ClientRectNeedsInterfaceUpdate then
begin
lWinControl.InvalidateClientRectCache(true);
lWinControl.DoAdjustClientRectChange;
if (lWinControl is TCustomPage)
and (lWinControl.Parent is TCustomNotebook) then