--- Merging r23297 into '.':

U    packages/fcl-image/src/fpcanvas.pp
U    packages/fcl-image/src/fppen.inc

# revisions: 23297
r23297 | sekelsenmat | 2013-01-02 15:28:09 +0100 (Wed, 02 Jan 2013) | 1 line
Changed paths:
   M /trunk/packages/fcl-image/src/fpcanvas.pp
   M /trunk/packages/fcl-image/src/fppen.inc

Adds support to join style and endcap in TFPCustomPen in fcl-image

git-svn-id: branches/fixes_2_6@23654 -

packages/fcl-image/src/fpcanvas.pp

@@ -115,6 +115,18 @@ type
                 pmMergePenNot, pmMaskPenNot, pmMergeNotPen, pmMaskNotPen, pmMerge,
                 pmNotMerge, pmMask, pmNotMask, pmXor, pmNotXor);
   TPenPattern = Longword;
+  TFPPenEndCap = (
+    pecRound,
+    pecSquare,
+    pecFlat
+  );
+  TFPPenJoinStyle = (
+    pjsRound,
+    pjsBevel,
+    pjsMiter
+  );
+
+  { TFPCustomPen }
 
   TFPCustomPen = class (TFPCanvasHelper)
   private
@@ -122,12 +134,16 @@ type
     FWidth : Integer;
     FMode : TFPPenMode;
     FPattern : longword;
+    FEndCap: TFPPenEndCap;
+    FJoinStyle: TFPPenJoinStyle;
   protected
     procedure DoCopyProps (From:TFPCanvasHelper); override;
     procedure SetMode (AValue : TFPPenMode); virtual;
     procedure SetWidth (AValue : Integer); virtual;
     procedure SetStyle (AValue : TFPPenStyle); virtual;
     procedure SetPattern (AValue : longword); virtual;
+    procedure SetEndCap(AValue: TFPPenEndCap); virtual;
+    procedure SetJoinStyle(AValue: TFPPenJoinStyle); virtual;
   public
     function CopyPen : TFPCustomPen;
     // Creates a copy of the pen with all properties the same, but not allocated
@@ -135,6 +151,8 @@ type
     property Width : Integer read FWidth write SetWidth;
     property Mode : TFPPenMode read FMode write SetMode;
     property Pattern : longword read FPattern write SetPattern;
+    property EndCap : TFPPenEndCap read FEndCap write SetEndCap;
+    property JoinStyle : TFPPenJoinStyle read FJoinStyle write SetJoinStyle;
   end;
   TFPCustomPenClass = class of TFPCustomPen;
   

packages/fcl-image/src/fppen.inc

@@ -37,6 +37,18 @@ begin
   FPattern := AValue;
 end;
 
+procedure TFPCustomPen.SetEndCap(AValue: TFPPenEndCap);
+begin
+  if FEndCap=AValue then Exit;
+  FEndCap:=AValue;
+end;
+
+procedure TFPCustomPen.SetJoinStyle(AValue: TFPPenJoinStyle);
+begin
+  if FJoinStyle=AValue then Exit;
+  FJoinStyle:=AValue;
+end;
+
 procedure TFPCustomPen.DoCopyProps (From:TFPCanvasHelper);
 begin
   with From as TFPCustomPen do