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

LCL: update FAdjustClientRectRealized in AlignControls and invalidate in StoreClientRect

Browse Source 
git-svn-id: trunk@25012 -
This commit is contained in:
mattias 2010-04-27 16:30:53 +00:00
parent 8e46525cff
commit 1bd393e280
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lcl/include/wincontrol.inc
View File

@ -3126,9 +3126,11 @@ begin
// first let the DockManager align controls
if DockSite and UseDockManager and (DockManager<>nil) then
DockManager.ResetBounds(false);
AdjustClientRect(RemainingClientRect);
FAdjustClientRectRealized:=RemainingClientRect;
if NeedAlignWork then
begin
AdjustClientRect(RemainingClientRect);
//DebugLn(['TWinControl.AlignControls AAA1 ',DbgSName(Self),' RemainingClientRect=',dbgs(RemainingClientRect),' ',dbgs(ClientRect)]);
RemainingBorderSpace:=Rect(0,0,0,0);
// adjust RemainingClientRect by ChildSizing properties
@ -3684,7 +3686,7 @@ begin
if not CompareRect(@R, @FAdjustClientRectRealized) then
begin
// client rect changed since last AlignControl
{$IFDEF VerboseAllAutoSize}
{$IF defined(VerboseAllAutoSize) or defined(VerboseClientRectBugFix)}
DebugLn('TWinControl.DoAdjustClientRectChange ClientRect changed ',Name,':',ClassName,
' Old=',Dbgs(FAdjustClientRectRealized.Right),'x',DbgS(FAdjustClientRectRealized.Bottom),
' New=',DbgS(r.Right),'x',DbgS(r.Bottom));
@ -3969,6 +3971,8 @@ function TWinControl.GetClientRect: TRect;
{$IFDEF OldAutoSize}
for i:=0 to ControlCount-1 do
Controls[i].fLastAlignedBoundsTried:=0;
{$ELSE}
FAdjustClientRectRealized:=Rect(0,0,0,0);
{$ENDIF}
end;
Exclude(FWinControlFlags,wcfClientRectNeedsUpdate);
@ -6780,8 +6784,8 @@ begin
GetWindowSize(Handle, NewWidth, NewHeight);
FBoundsRealized := Bounds(Message.XPos, Message.YPos, NewWidth, NewHeight);
{$IFNDEF OldAutoSize}
InvalidatePreferredChildSizes;
if AutoSizingAll then begin
if ([caspCreatingHandles,caspComputingBounds]*AutoSizePhases<>[])
then begin
// while the LCL is creating handles the widgetset may send default bounds
// we have not yet told the widgetset the final bounds
// => the InvalidatePreferredSize and the InvalidateClientRectCache
@ -6789,6 +6793,7 @@ begin
// size algorithm to take care of the new bounds
// => do not call SetBounds, as this will set the Bounds to the widgetset
// default values.
//DebugLn(['TWinControl.WMSize from intf ignored, because phases=',dbgs(AutoSizePhases),' boundsrealized=',wcfBoundsRealized in FWinControlFlags]);
exit;
end;
{$ENDIF}
@ -6837,13 +6842,13 @@ begin
' BoundsRealized=',dbgs(FBoundsRealized),
' wcfClientRectNeedsUpdate=',wcfClientRectNeedsUpdate in FWinControlFlags]);
{$ENDIF}
if not (wcfBoundsRealized in FWinControlFlags) then exit;
{$IFDEF VerboseClientRectBugFix}
if Name=CheckClientRectName then
//if Name=CheckClientRectName then
DebugLn(['TWinControl.WMSize FromIntf ',dbgsname(Self),' Message=',Message.Width,',',Message.Height,
' BoundsRealized=',dbgs(FBoundsRealized),
' wcfClientRectNeedsUpdate=',wcfClientRectNeedsUpdate in FWinControlFlags]);
{$ENDIF}
if not (wcfBoundsRealized in FWinControlFlags) then exit;
NewLeft := FBoundsRealized.Left;
NewTop := FBoundsRealized.Top;
@ -6860,10 +6865,10 @@ begin
' wcfClientRectNeedsUpdate=',wcfClientRectNeedsUpdate in FWinControlFlags]);
{$ENDIF}
FBoundsRealized := NewBoundsRealized;
{$IFNDEF OldAutoSize}
//DebugLn(['TWinControl.WMSize ',DbgSName(Self),' phases=',dbgs(AutoSizePhases)]);
if ([caspCreatingHandles,caspComputingBounds]*AutoSizePhases<>[])
or (not (wcfBoundsRealized in FWinControlFlags))
then begin
// while the LCL is creating handles the widgetset may send default bounds
// we have not yet told the widgetset the final bounds
@ -6877,7 +6882,6 @@ begin
end;
{$ENDIF}
FBoundsRealized := NewBoundsRealized;
{$IFNDEF OldAutoSize}
if Parent<>nil then
{$ENDIF}
@ -6900,6 +6904,13 @@ begin
and ClientRectNeedsInterfaceUpdate then
DoAdjustClientRectChange;
{$ENDIF}
{$IFDEF VerboseClientRectBugFix}
//if Name=CheckClientRectName then
if ((Message.SizeType and Size_SourceIsInterface) > 0) then
DebugLn(['TWinControl.WMSize END ',dbgsname(Self),' Message=',Message.Width,',',Message.Height,
' BoundsRealized=',dbgs(FBoundsRealized),' ClientRect=',dbgs(ClientRect),
' ']);
{$ENDIF}
end;
{------------------------------------------------------------------------------