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

LCL: improved debugging changebounds, removed TCustomLabel AdjustSize in loaded

Browse Source 
git-svn-id: trunk@24075 -
This commit is contained in:
mattias 2010-03-18 00:17:35 +00:00
parent 3f79d12265
commit 62fc1305ad
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lcl/include/control.inc
View File

@ -56,8 +56,9 @@ begin
if (Parent=nil) and (not (cfAutoSizeNeeded in FControlFlags)) if (Parent=nil) and (not (cfAutoSizeNeeded in FControlFlags))
and (Self is TCustomForm) then begin and (Self is TCustomForm) then begin
DebugLn(['TControl.Adjustsize ',DbgSName(Self)]); DebugLn(['TControl.Adjustsize ',DbgSName(Self)]);
if Name='SearchResultsView' then begin if Name='SearchResults' then begin
debugln(GetStackTrace(true)); //debugln(GetStackTrace(true));
DebugLn(['TControl.Adjustsize AAA1']);
end; end;
end; end;
{$ENDIF} {$ENDIF}
@ -365,7 +366,7 @@ begin
PosChanged := (FLeft <> ALeft) or (FTop <> ATop); PosChanged := (FLeft <> ALeft) or (FTop <> ATop);
if (not SizeChanged) and (not PosChanged) then Exit; if (not SizeChanged) and (not PosChanged) then Exit;
//DebugLn('TControl.ChangeBounds A ',Name,':',ClassName); //DebugLn('TControl.ChangeBounds A ',DbgSName(Self),' Old=',dbgs(BoundsRect),' New=',dbgs(NewBounds));
if (not (csLoading in ComponentState)) if (not (csLoading in ComponentState))
and (not (Self is TWinControl)) then and (not (Self is TWinControl)) then
InvalidateControl(IsControlVisible, False, true); InvalidateControl(IsControlVisible, False, true);
@ -2392,7 +2393,9 @@ end;
procedure TControl.DoAutoSize; procedure TControl.DoAutoSize;
begin begin
//Handled by TWinControl, or other descendants //Handled by TWinControl, or other descendants
{$IFNDEF OldAutoSize}
Exclude(FControlFlags,cfAutoSizeNeeded); Exclude(FControlFlags,cfAutoSizeNeeded);
{$ENDIF}
end; end;
{------------------------------------------------------------------------------ {------------------------------------------------------------------------------

3
lcl/include/customlabel.inc
View File

@ -84,6 +84,7 @@ var
NewWidth, NewHeight: integer; NewWidth, NewHeight: integer;
CurAnchors: TAnchors; CurAnchors: TAnchors;
begin begin
inherited DoAutoSize;
//debugln('TCustomLabel.DoAutoSize ',DbgSName(Self),' AutoSizing=',dbgs(AutoSizing),' AutoSize=',dbgs(AutoSize),' Parent=',DbgSName(Parent),' csLoading=',dbgs(csLoading in ComponentState),' Parnet.HandleAllocated=',dbgs((Parent<>nil) and (Parent.HandleAllocated))); //debugln('TCustomLabel.DoAutoSize ',DbgSName(Self),' AutoSizing=',dbgs(AutoSizing),' AutoSize=',dbgs(AutoSize),' Parent=',DbgSName(Parent),' csLoading=',dbgs(csLoading in ComponentState),' Parnet.HandleAllocated=',dbgs((Parent<>nil) and (Parent.HandleAllocated)));
if OptimalFill and (not AutoSize) then if OptimalFill and (not AutoSize) then
begin begin
@ -298,7 +299,9 @@ end;
procedure TCustomLabel.Loaded; procedure TCustomLabel.Loaded;
begin begin
inherited Loaded; inherited Loaded;
{$IFNDEF OldAutoSize}
AdjustSize; AdjustSize;
{$ENDIF}
end; end;
procedure TCustomLabel.UpdateSize; procedure TCustomLabel.UpdateSize;