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

LCL: TControlBorderSpacing.GetSideSpace and GetSpace were swapped, fixed

Browse Source 
git-svn-id: trunk@32543 -
This commit is contained in:
mattias 2011-09-28 13:07:25 +00:00
parent 2af1e2be42
commit 785a28d88e
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
designer/designer.pp
View File

@ -2776,10 +2776,10 @@ begin
if csNoDesignSelectable in CurControl.ControlStyle then
Continue;
aDDC.Canvas.FrameRect(
CurControl.Left-CurControl.BorderSpacing.GetSpace(akLeft),
CurControl.Top-CurControl.BorderSpacing.GetSpace(akTop),
CurControl.Left+CurControl.Width+CurControl.BorderSpacing.GetSpace(akRight)-1,
CurControl.Top+CurControl.Height+CurControl.BorderSpacing.GetSpace(akBottom)-1
CurControl.Left-CurControl.BorderSpacing.GetSideSpace(akLeft),
CurControl.Top-CurControl.BorderSpacing.GetSideSpace(akTop),
CurControl.Left+CurControl.Width+CurControl.BorderSpacing.GetSideSpace(akRight)-1,
CurControl.Top+CurControl.Height+CurControl.BorderSpacing.GetSideSpace(akBottom)-1
);
end;
end;

18
lcl/controls.pp
View File

@ -709,8 +709,8 @@ type
procedure AssignTo(Dest: TPersistent); override;
function IsEqual(Spacing: TControlBorderSpacing): boolean;
procedure GetSpaceAround(var SpaceAround: TRect);
function GetSideSpace(Kind: TAnchorKind): Integer; // Around+GetSpace
function GetSpace(Kind: TAnchorKind): Integer;
function GetSideSpace(Kind: TAnchorKind): Integer;
public
property Control: TControl read FControl;
property Space[Kind: TAnchorKind]: integer read GetSpace write SetSpace;
@ -3199,12 +3199,12 @@ begin
end;
function TControlBorderSpacing.GetSpace(Kind: TAnchorKind): Integer;
function TControlBorderSpacing.GetSideSpace(Kind: TAnchorKind): Integer;
begin
Result:=Around+GetSideSpace(Kind);
Result:=Around+GetSpace(Kind);
end;
function TControlBorderSpacing.GetSideSpace(Kind: TAnchorKind): Integer;
function TControlBorderSpacing.GetSpace(Kind: TAnchorKind): Integer;
begin
case Kind of
akLeft: Result:=Left;
@ -3581,7 +3581,7 @@ begin
ReferenceSide:=CurReferenceSide;
// -> calculate Position
OwnerBorderSpacing:=FOwner.BorderSpacing.GetSpace(Kind);
OwnerBorderSpacing:=FOwner.BorderSpacing.GetSideSpace(Kind);
//if CheckPosition(Owner) then DebugLn(['TAnchorSide.GetSidePosition ',dbgsName(Owner),' ReferenceControl=',dbgsName(ReferenceControl),' ',dbgs(ReferenceControl.BoundsRect),' OwnerBorderSpacing=',OwnerBorderSpacing,' Kind=',dbgs(Kind),' ReferenceSide=',dbgs(Kind,ReferenceSide)]);
case ReferenceSide of
@ -3597,7 +3597,7 @@ begin
OwnerParent.ChildSizing.LeftRightSpacing)
else if Kind=akRight then
OwnerBorderSpacing:=Max(Max(OwnerBorderSpacing,
ReferenceControl.BorderSpacing.GetSpace(OppositeAnchor[Kind])),
ReferenceControl.BorderSpacing.GetSideSpace(OppositeAnchor[Kind])),
OwnerParent.ChildSizing.HorizontalSpacing);
if Kind=akLeft then begin
// anchor left of ReferenceControl and left of Owner
@ -3617,7 +3617,7 @@ begin
OwnerParent.ChildSizing.TopBottomSpacing)
else if Kind=akBottom then
OwnerBorderSpacing:=Max(Max(OwnerBorderSpacing,
ReferenceControl.BorderSpacing.GetSpace(OppositeAnchor[Kind])),
ReferenceControl.BorderSpacing.GetSideSpace(OppositeAnchor[Kind])),
OwnerParent.ChildSizing.VerticalSpacing);
if Kind=akTop then begin
// anchor top of ReferenceControl and top of Owner
@ -3640,7 +3640,7 @@ begin
OwnerParent.ChildSizing.LeftRightSpacing)
else if Kind=akLeft then
OwnerBorderSpacing:=Max(Max(OwnerBorderSpacing,
ReferenceControl.BorderSpacing.GetSpace(OppositeAnchor[Kind])),
ReferenceControl.BorderSpacing.GetSideSpace(OppositeAnchor[Kind])),
OwnerParent.ChildSizing.HorizontalSpacing);
if Kind=akLeft then begin
// anchor right of ReferenceControl and left of Owner
@ -3660,7 +3660,7 @@ begin
OwnerParent.ChildSizing.TopBottomSpacing)
else if Kind=akTop then
OwnerBorderSpacing:=Max(Max(OwnerBorderSpacing,
ReferenceControl.BorderSpacing.GetSpace(OppositeAnchor[Kind])),
ReferenceControl.BorderSpacing.GetSideSpace(OppositeAnchor[Kind])),
OwnerParent.ChildSizing.VerticalSpacing);
if Kind=akTop then begin
// anchor bottom of ReferenceControl and top of Owner

2
lcl/include/wincontrol.inc
View File

@ -848,7 +848,7 @@ begin
// this is a non aligned control
//DebugLn(['TAutoSizeCtrlData.DoMoveNonAlignedChilds Child=',DbgSName(Child),' Side=',dbgs(Side)]);
if FindMinimum then begin
AddSpace:=Child.BorderSpacing.GetSpace(Side);
AddSpace:=Child.BorderSpacing.GetSideSpace(Side);
if Side=akLeft then
AddSpace:=Max(AddSpace,WinControl.ChildSizing.LeftRightSpacing)
else