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

lcl: less with-blocks due to FPC 3.1.1 new record methods

Browse Source 
git-svn-id: trunk@50255 -
This commit is contained in:
mattias 2015-11-08 10:34:25 +00:00
parent 936b768f7c
commit 6eac9e78aa
1 changed files with 100 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
lcl/include/shape.inc
View File

@ -57,13 +57,16 @@ begin
if PaintRect.Top = PaintRect.Bottom then
PaintRect.Bottom := PaintRect.Bottom + 1;
MinSize := Min(PaintRect.Right - PaintRect.Left, PaintRect.Bottom - PaintRect.Top);
with PaintRect do
begin
MinSize := Min(Right - Left, Bottom - Top);
if FShape in [stSquare, stRoundSquare, stCircle, stSquaredDiamond] then
begin
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;
Left := Left + ((Right - Left) - MinSize) div 2;
Top := Top + ((Bottom - Top) - MinSize) div 2;
Right := Left + MinSize;
Bottom := Top + MinSize;
end;
end;
case FShape of
@ -75,17 +78,22 @@ begin
Ellipse(PaintRect);
stSquaredDiamond, stDiamond:
begin
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;
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[2].y := P[0].y;
P[3].x := P[1].x;
P[3].y := PaintRect.Bottom - 1;
P[3].y := Bottom - 1;
Polygon(P);
end;
end;
stTriangle:
begin
with Self do
begin
P[0].x := (Width - 1) div 2;
P[0].y := PenInc;
@ -97,7 +105,10 @@ begin
P[3].y := P[0].y;
Polygon(P);
end;
end;
stTriangleDown:
begin
with Self do
begin
P[0].x := (Width - 1) div 2;
P[0].y := Height - PenInc - 1;
@ -109,7 +120,10 @@ begin
P[3].y := P[0].y;
Polygon(P);
end;
end;
stTriangleLeft:
begin
with Self do
begin
P[0].x := PenInc;
P[0].y := Height div 2;
@ -121,7 +135,10 @@ begin
P[3].y := P[0].y;
Polygon(P);
end;
end;
stTriangleRight:
begin
with Self do
begin
P[0].x := Width - PenInc - 1;
P[0].y := Height div 2;
@ -133,8 +150,11 @@ begin
P[3].y := P[0].y;
Polygon(P);
end;
end;
stStar,
stStarDown:
begin
with Self do
begin
//radius if star scaled by height
RadiusBig := Trunc((Height-Pen.Width) / (1+cos(pi/5)));
@ -171,6 +191,7 @@ begin
end;
end;
end;
end;
// to fire OnPaint event
inherited Paint;
end;