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

LCL: call UpdateShowing for top level control outside autosize loop, needed for Form moves in Form.OnShow, bug #16087

Browse Source 
git-svn-id: trunk@24662 -
This commit is contained in:
mattias 2010-04-17 13:09:02 +00:00
parent 1446a85067
commit 7b1b83e91a
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lcl/include/wincontrol.inc
View File

@ -3445,7 +3445,8 @@ procedure TWinControl.DoAllAutoSize;
ClearRequests(TWinControl(AControl).Controls[i]);
end;
procedure UpdateShowingRecursive(AWinControl: TWinControl);
procedure UpdateShowingRecursive(AWinControl: TWinControl;
OnlyChilds: boolean);
var
i: Integer;
begin
@ -3453,9 +3454,9 @@ procedure TWinControl.DoAllAutoSize;
if AWinControl.FControls<>nil then
for i:=0 to AWinControl.FControls.Count-1 do
if TObject(AWinControl.FControls[i]) is TWinControl then
UpdateShowingRecursive(TWinControl(AWinControl.FControls[i]));
UpdateShowingRecursive(TWinControl(AWinControl.FControls[i]),false);
// then make the control visible
if AWinControl.HandleObjectShouldBeVisible
if (not OnlyChilds) and AWinControl.HandleObjectShouldBeVisible
and (not AWinControl.Showing) then
AWinControl.UpdateShowing;
end;
@ -3497,13 +3498,13 @@ begin
{$ENDIF}
RealizeBoundsRecursive;
if (cfAutoSizeNeeded in FControlFlags) then continue; // repeat computing bounds
// make handles visible
// make child handles visible
{$IFDEF VerboseAllAutoSize}
DebugLn(['TWinControl.DoAllAutoSize UPDATESHOWING ',DbgSName(Self),' lclbounds=',dbgs(BoundsRect)]);
{$ENDIF}
Include(FWinControlFlags,wcfUpdateShowing);
try
UpdateShowingRecursive(Self);
UpdateShowingRecursive(Self,true);
finally
Exclude(FWinControlFlags,wcfUpdateShowing);
end;
@ -3516,6 +3517,17 @@ begin
finally
Exclude(FWinControlFlags,wcfAllAutoSizing);
end;
// make handle visible => this can trigger events like Form.OnShow where
// application do arbitrary stuff
{$IFDEF VerboseAllAutoSize}
DebugLn(['TWinControl.DoAllAutoSize UPDATESHOWING ',DbgSName(Self),' lclbounds=',dbgs(BoundsRect)]);
{$ENDIF}
Include(FWinControlFlags,wcfUpdateShowing);
try
UpdateShowingRecursive(Self,false);
finally
Exclude(FWinControlFlags,wcfUpdateShowing);
end;
end;
procedure TWinControl.AllAutoSized;