paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-28 12:02:48 +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@50254 -
This commit is contained in:
mattias 2015-11-08 10:32:23 +00:00
parent 12697b9fd7
commit 936b768f7c
1 changed files with 80 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

181
lcl/include/shape.inc
View File

@ -57,16 +57,13 @@ begin
if PaintRect.Top = PaintRect.Bottom then if PaintRect.Top = PaintRect.Bottom then
PaintRect.Bottom := PaintRect.Bottom + 1; PaintRect.Bottom := PaintRect.Bottom + 1;
with PaintRect do MinSize := Min(PaintRect.Right - PaintRect.Left, PaintRect.Bottom - PaintRect.Top);
if FShape in [stSquare, stRoundSquare, stCircle, stSquaredDiamond] then
begin begin
MinSize := Min(Right - Left, Bottom - Top); PaintRect.Left := PaintRect.Left + ((PaintRect.Right - PaintRect.Left) - MinSize) div 2;
if FShape in [stSquare, stRoundSquare, stCircle, stSquaredDiamond] then PaintRect.Top := PaintRect.Top + ((PaintRect.Bottom - PaintRect.Top) - MinSize) div 2;
begin PaintRect.Right := PaintRect.Left + MinSize;
Left := Left + ((Right - Left) - MinSize) div 2; PaintRect.Bottom := PaintRect.Top + MinSize;
Top := Top + ((Bottom - Top) - MinSize) div 2;
Right := Left + MinSize;
Bottom := Top + MinSize;
end;
end; end;
case FShape of case FShape of
@ -78,117 +75,99 @@ begin
Ellipse(PaintRect); Ellipse(PaintRect);
stSquaredDiamond, stDiamond: stSquaredDiamond, stDiamond:
begin begin
with PaintRect do P[0].x := PaintRect.Left;
begin P[0].y := (PaintRect.Top + PaintRect.Bottom) div 2;
P[0].x := Left; P[1].x := (PaintRect.Left + PaintRect.Right) div 2;
P[0].y := (Top + Bottom) div 2; P[1].y := PaintRect.Top;
P[1].x := (Left + Right) div 2; P[2].x := PaintRect.Right - 1;
P[1].y := Top; P[2].y := P[0].y;
P[2].x := Right - 1; P[3].x := P[1].x;
P[2].y := P[0].y; P[3].y := PaintRect.Bottom - 1;
P[3].x := P[1].x; Polygon(P);
P[3].y := Bottom - 1;
Polygon(P);
end;
end; end;
stTriangle: stTriangle:
begin begin
with Self do P[0].x := (Width - 1) div 2;
begin P[0].y := PenInc;
P[0].x := (Width - 1) div 2; P[1].x := Width - PenInc - 1;
P[0].y := PenInc; P[1].y := Height - PenInc - 1;
P[1].x := Width - PenInc - 1; P[2].x := PenInc;
P[1].y := Height - PenInc - 1; P[2].y := Height - PenInc - 1;
P[2].x := PenInc; P[3].x := P[0].x;
P[2].y := Height - PenInc - 1; P[3].y := P[0].y;
P[3].x := P[0].x; Polygon(P);
P[3].y := P[0].y;
Polygon(P);
end;
end; end;
stTriangleDown: stTriangleDown:
begin begin
with Self do P[0].x := (Width - 1) div 2;
begin P[0].y := Height - PenInc - 1;
P[0].x := (Width - 1) div 2; P[1].x := Width - PenInc - 1;
P[0].y := Height - PenInc - 1; P[1].y := PenInc;
P[1].x := Width - PenInc - 1; P[2].x := PenInc;
P[1].y := PenInc; P[2].y := PenInc;
P[2].x := PenInc; P[3].x := P[0].x;
P[2].y := PenInc; P[3].y := P[0].y;
P[3].x := P[0].x; Polygon(P);
P[3].y := P[0].y;
Polygon(P);
end;
end; end;
stTriangleLeft: stTriangleLeft:
begin begin
with Self do P[0].x := PenInc;
begin P[0].y := Height div 2;
P[0].x := PenInc; P[1].x := Width - PenInc - 1;
P[0].y := Height div 2; P[1].y := PenInc;
P[1].x := Width - PenInc - 1; P[2].x := Width - PenInc - 1;
P[1].y := PenInc; P[2].y := Height - PenInc - 1;
P[2].x := Width - PenInc - 1; P[3].x := P[0].x;
P[2].y := Height - PenInc - 1; P[3].y := P[0].y;
P[3].x := P[0].x; Polygon(P);
P[3].y := P[0].y;
Polygon(P);
end;
end; end;
stTriangleRight: stTriangleRight:
begin begin
with Self do P[0].x := Width - PenInc - 1;
begin P[0].y := Height div 2;
P[0].x := Width - PenInc - 1; P[1].x := PenInc;
P[0].y := Height div 2; P[1].y := PenInc;
P[1].x := PenInc; P[2].x := PenInc;
P[1].y := PenInc; P[2].y := Height - PenInc - 1;
P[2].x := PenInc; P[3].x := P[0].x;
P[2].y := Height - PenInc - 1; P[3].y := P[0].y;
P[3].x := P[0].x; Polygon(P);
P[3].y := P[0].y;
Polygon(P);
end;
end; end;
stStar, stStar,
stStarDown: stStarDown:
begin begin
with Self do //radius if star scaled by height
RadiusBig := Trunc((Height-Pen.Width) / (1+cos(pi/5)));
//radius if star scaled by width
RadiusBig2 := Trunc((Width-Pen.Width) / (2*sin(pi*2/5)));
if RadiusBig<=RadiusBig2 then
begin begin
//radius if star scaled by height if FShape=stStar then
RadiusBig := Trunc((Height-Pen.Width) / (1+cos(pi/5))); PCenter.Y := RadiusBig+PenDec
//radius if star scaled by width
RadiusBig2 := Trunc((Width-Pen.Width) / (2*sin(pi*2/5)));
if RadiusBig<=RadiusBig2 then
begin
if FShape=stStar then
PCenter.Y := RadiusBig+PenDec
else
PCenter.Y := Height-RadiusBig-PenDec;
end
else else
begin PCenter.Y := Height-RadiusBig-PenDec;
RadiusBig := RadiusBig2; end
PCenter.Y := Height div 2; else
end; begin
PCenter.X := Width div 2; RadiusBig := RadiusBig2;
RadiusSm := RadiusBig * 57 div 150; PCenter.Y := Height div 2;
for i := 0 to 4 do
begin
Alfa := GetStarAngle(i*2, FShape=stStarDown);
PStar[i*2].x := PCenter.X + Round(RadiusBig*cos(Alfa));
PStar[i*2].y := PCenter.Y - Round(RadiusBig*sin(Alfa));
Alfa:= GetStarAngle(i*2+1, FShape=stStarDown);
PStar[i*2+1].x := PCenter.X + Round(RadiusSm*cos(Alfa));
PStar[i*2+1].y := PCenter.Y - Round(RadiusSm*sin(Alfa));
end;
PStar[10] := PStar[0];
Polygon(PStar);
end; end;
PCenter.X := Width div 2;
RadiusSm := RadiusBig * 57 div 150;
for i := 0 to 4 do
begin
Alfa := GetStarAngle(i*2, FShape=stStarDown);
PStar[i*2].x := PCenter.X + Round(RadiusBig*cos(Alfa));
PStar[i*2].y := PCenter.Y - Round(RadiusBig*sin(Alfa));
Alfa:= GetStarAngle(i*2+1, FShape=stStarDown);
PStar[i*2+1].x := PCenter.X + Round(RadiusSm*cos(Alfa));
PStar[i*2+1].y := PCenter.Y - Round(RadiusSm*sin(Alfa));
end;
PStar[10] := PStar[0];
Polygon(PStar);
end; end;
end; end;
end; end;