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

cleanup

Browse Source 
git-svn-id: trunk@7750 -
This commit is contained in:
mattias 2005-09-19 22:16:24 +00:00
parent 7083dd9b6a
commit a5ade72536
1 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lcl/include/wincontrol.inc
View File

@ -284,11 +284,7 @@ var
{$IFDEF CHECK_POSITION} {$IFDEF CHECK_POSITION}
//if csDesigning in ComponentState then //if csDesigning in ComponentState then
<<<<<<< .mine
//if AnsiCompareText(Control.ClassName,'TScrollBar')=0 then
=======
if AnsiCompareText(Control.ClassName,CheckPostionClassName)=0 then if AnsiCompareText(Control.ClassName,CheckPostionClassName)=0 then
>>>>>>> .r7741
DebugLn('[TWinControl.AlignControls.DoPosition] Before Anchoring ', DebugLn('[TWinControl.AlignControls.DoPosition] Before Anchoring ',
' Self='+DbgSName(Self),' Control='+DbgSName(Control), ' Self='+DbgSName(Self),' Control='+DbgSName(Control),
' CurBaseBounds='+dbgs(CurBaseBounds.Left)+','+dbgs(CurBaseBounds.Top)+','+dbgs(CurBaseBounds.Right-CurBaseBounds.Left)+','+dbgs(CurBaseBounds.Bottom-CurBaseBounds.Top), ' CurBaseBounds='+dbgs(CurBaseBounds.Left)+','+dbgs(CurBaseBounds.Top)+','+dbgs(CurBaseBounds.Right-CurBaseBounds.Left)+','+dbgs(CurBaseBounds.Bottom-CurBaseBounds.Top),
@ -407,19 +403,11 @@ var
ChildAroundSpace); ChildAroundSpace);
{$IFDEF CHECK_POSITION} {$IFDEF CHECK_POSITION}
<<<<<<< .mine
if CompareText(Control.ClassName,'TPanel')=0 then
DebugLn(' Before aligning akRight in AnchorAlign[AAlign]='+dbgs(akRight in AnchorAlign[AAlign]),
' akLeft in Control.Anchors='+dbgs(akLeft in Control.Anchors),
' ARect=',dbgs(ARect),
' New=',dbgs(NewLeft)+','+dbgs(NewTop)+','+dbgs(NewRight)+','+dbgs(NewBottom));
=======
if CompareText(Control.ClassName,CheckPostionClassName)=0 then if CompareText(Control.ClassName,CheckPostionClassName)=0 then
DebugLn(' Before aligning akRight in AnchorAlign[AAlign]=',DbgS(akRight in AnchorAlign[AAlign]), DebugLn(' Before aligning akRight in AnchorAlign[AAlign]=',DbgS(akRight in AnchorAlign[AAlign]),
' akLeft in Control.Anchors=',DbgS(akLeft in Control.Anchors), ' akLeft in Control.Anchors=',DbgS(akLeft in Control.Anchors),
//' ARect=',ARect.Left,',',ARect.Top,',',ARect.Right,',',ARect.Bottom, //' ARect=',ARect.Left,',',ARect.Top,',',ARect.Right,',',ARect.Bottom,
' New=',DbgS(NewLeft,NewTop,NewRight,NewBottom)); ' New=',DbgS(NewLeft,NewTop,NewRight,NewBottom));
>>>>>>> .r7741
{$ENDIF} {$ENDIF}
if akLeft in AnchorAlign[AAlign] then begin if akLeft in AnchorAlign[AAlign] then begin
if (akRight in CurAnchors) then begin if (akRight in CurAnchors) then begin
@ -502,18 +490,10 @@ var
or (Control.Width <> NewWidth) or (Control.Height <> NewHeight) then begin or (Control.Width <> NewWidth) or (Control.Height <> NewHeight) then begin
{$IFDEF CHECK_POSITION} {$IFDEF CHECK_POSITION}
//if csDesigning in Control.ComponentState then //if csDesigning in Control.ComponentState then
<<<<<<< .mine
//if CompareText(Control.ClassName,'TScrollBar')=0 then
=======
if CompareText(Control.ClassName,CheckPostionClassName)=0 then if CompareText(Control.ClassName,CheckPostionClassName)=0 then
>>>>>>> .r7741
with Control do with Control do
<<<<<<< .mine
DebugLn('[TWinControl.AlignControls.DoPosition] NEW BOUNDS Control=',DbgSName(Control), DebugLn('[TWinControl.AlignControls.DoPosition] NEW BOUNDS Control=',DbgSName(Control),
' New=',dbgs(NewLeft)+','+dbgs(NewTop)+','+dbgs(NewRight)+','+dbgs(NewBottom)); ' New=',dbgs(NewLeft)+','+dbgs(NewTop)+','+dbgs(NewRight)+','+dbgs(NewBottom));
=======
DebugLn('[TWinControl.AlignControls.DoPosition] NEW BOUNDS Control=',Name,':',ClassName,' NewBounds=',DbgS(NewLeft,NewTop,NewWidth,NewHeight),' Align=',AlignNames[AAlign]);
>>>>>>> .r7741
{$ENDIF} {$ENDIF}
// lock the base bounds, so that the new automatic bounds do not override // lock the base bounds, so that the new automatic bounds do not override
// the user settings // the user settings