lcl: formatting

git-svn-id: trunk@18815 -
This commit is contained in:
paul 2009-02-24 04:41:24 +00:00
parent b95e622129
commit a4a728b2a4

View File

@ -4,7 +4,7 @@
* *
* This file is part of the Lazarus Component Library (LCL) *
* *
* See the file COPYING.modifiedLGPL.txt, included in this distribution, *
* See the file COPYING.modifiedLGPL.txt, included in this distribution, *
* for details about the copyright. *
* *
* This program is distributed in the hope that it will be useful, *
@ -17,7 +17,7 @@
constructor TShape.Create(TheOwner: TComponent);
begin
inherited Create(TheOwner);
SetInitialBounds(0,0,GetControlClassDefaultSize.X,GetControlClassDefaultSize.Y);
SetInitialBounds(0, 0, GetControlClassDefaultSize.X, GetControlClassDefaultSize.Y);
ControlStyle := ControlStyle + [csReplicatable];
FPen := TPen.Create;
FPen.OnChange := @StyleChanged;
@ -34,8 +34,8 @@ end;
procedure TShape.Paint;
var
PaintRect : TRect;
MinSize : Longint;
PaintRect: TRect;
MinSize: Longint;
P: array[0..3] of TPoint;
begin
with Canvas do
@ -43,9 +43,10 @@ begin
Pen := FPen;
Brush := FBrush;
PaintRect := Rect(0,0,Self.Width - 1, Self.Height - 1);
PaintRect := Rect(0, 0, Self.Width - 1, Self.Height - 1);
InflateRect(PaintRect, -(Pen.Width div 2), -(Pen.Width div 2));
With PaintRect do begin
with PaintRect do
begin
MinSize := Min(Right - Left, Bottom - Top);
if FShape in [stSquare, stRoundSquare, stCircle, stSquaredDiamond] then
begin
@ -64,13 +65,20 @@ begin
stCircle, stEllipse:
Ellipse(PaintRect);
stSquaredDiamond, stDiamond:
with PaintRect do begin
P[0].x:=Left; P[0].y:=Top + (Bottom - Top) div 2;
P[1].x:=Left+ (Right - Left) div 2; P[1].y:=Bottom;
P[2].x:=Right; P[2].y:= P[0].y;
P[3].x:=P[1].x; P[3].y:=Top;
begin
with PaintRect do
begin
P[0].x := Left;
P[0].y := Top + (Bottom - Top) div 2;
P[1].x := Left + (Right - Left) div 2;
P[1].y := Bottom;
P[2].x := Right;
P[2].y := P[0].y;
P[3].x := P[1].x;
P[3].y := Top;
Polygon(P);
end;
end;
end;
end;
// to fire OnPaint event
@ -79,21 +87,20 @@ end;
procedure TShape.StyleChanged(Sender: TObject);
begin
If (Parent <> nil) and (Visible or (csDesigning in ComponentState))
and Parent.HandleAllocated
then
if (Parent <> nil) and (Visible or (csDesigning in ComponentState)) and
Parent.HandleAllocated then
Invalidate;
end;
procedure TShape.SetBrush(Value: TBrush);
begin
If Value <> Brush then
if Value <> Brush then
FBrush.Assign(Value);
end;
procedure TShape.SetPen(Value: TPen);
begin
If Value <> Pen then
if Value <> Pen then
FPen.Assign(Value);
end;
@ -108,7 +115,7 @@ end;
class function TShape.GetControlClassDefaultSize: TPoint;
begin
Result.X:=65;
Result.Y:=65;
Result.X := 65;
Result.Y := 65;
end;