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

lcl: less with-blocks for FPC 3.1.1

Browse Source 
git-svn-id: trunk@50284 -
This commit is contained in:
mattias 2015-11-11 12:55:40 +00:00
parent 8e6619ee06
commit 00b0e7df39
1 changed files with 91 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lcl/include/shape.inc
View File

@ -57,16 +57,13 @@ begin
if PaintRect.Top = PaintRect.Bottom then
PaintRect.Bottom := PaintRect.Bottom + 1;
with PaintRect do
begin
MinSize := Min(Right - Left, Bottom - Top);
MinSize := Min(PaintRect.Right - PaintRect.Left, PaintRect.Bottom - PaintRect.Top);
if FShape in [stSquare, stRoundSquare, stCircle, stSquaredDiamond] then
begin
Left := Left + ((Right - Left) - MinSize) div 2;
Top := Top + ((Bottom - Top) - MinSize) div 2;
Right := Left + MinSize;
Bottom := Top + MinSize;
end;
PaintRect.Left := PaintRect.Left + ((PaintRect.Right - PaintRect.Left) - MinSize) div 2;
PaintRect.Top := PaintRect.Top + ((PaintRect.Bottom - PaintRect.Top) - MinSize) div 2;
PaintRect.Right := PaintRect.Left + MinSize;
PaintRect.Bottom := PaintRect.Top + MinSize;
end;
case FShape of
@ -78,19 +75,16 @@ begin
Ellipse(PaintRect);
stSquaredDiamond, stDiamond:
begin
with PaintRect do
begin
P[0].x := Left;
P[0].y := (Top + Bottom) div 2;
P[1].x := (Left + Right) div 2;
P[1].y := Top;
P[2].x := Right - 1;
P[0].x := PaintRect.Left;
P[0].y := (PaintRect.Top + PaintRect.Bottom) div 2;
P[1].x := (PaintRect.Left + PaintRect.Right) div 2;
P[1].y := PaintRect.Top;
P[2].x := PaintRect.Right - 1;
P[2].y := P[0].y;
P[3].x := P[1].x;
P[3].y := Bottom - 1;
P[3].y := PaintRect.Bottom - 1;
Polygon(P);
end;
end;
stTriangle:
begin
with Self do