Browse Source

Renamed stroke Shape properties according to WPF naming

pull/352/head
susloparov 11 years ago
parent
commit
40c01b73fb
  1. 8
      src/Perspex.Controls/Shapes/Shape.cs
  2. 6
      tests/Perspex.RenderTests/Shapes/PathTests.cs

8
src/Perspex.Controls/Shapes/Shape.cs

@ -90,11 +90,11 @@ namespace Perspex.Controls.Shapes
set { SetValue(StrokeThicknessProperty, value); }
}
public PenLineCap DashCap { get; set; } = PenLineCap.Flat;
public PenLineCap StrokeDashCap { get; set; } = PenLineCap.Flat;
public PenLineCap StartLineCap { get; set; } = PenLineCap.Flat;
public PenLineCap StrokeStartLineCap { get; set; } = PenLineCap.Flat;
public PenLineCap EndLineCap { get; set; } = PenLineCap.Flat;
public PenLineCap StrokeEndLineCap { get; set; } = PenLineCap.Flat;
public override void Render(DrawingContext context)
{
@ -103,7 +103,7 @@ namespace Perspex.Controls.Shapes
if (geometry != null)
{
var pen = new Pen(Stroke, StrokeThickness, new DashStyle(StrokeDashArray),
DashCap, StartLineCap, EndLineCap);
StrokeDashCap, StrokeStartLineCap, StrokeEndLineCap);
context.DrawGeometry(Fill, pen, geometry);
}
}

6
tests/Perspex.RenderTests/Shapes/PathTests.cs

@ -149,10 +149,10 @@ namespace Perspex.Direct2D1.RenderTests.Shapes
StrokeThickness = 10,
HorizontalAlignment = HorizontalAlignment.Center,
VerticalAlignment = VerticalAlignment.Center,
DashCap = PenLineCap.Triangle,
StrokeDashCap = PenLineCap.Triangle,
StrokeDashArray = new PerspexList<double>(3, 1),
StartLineCap = PenLineCap.Round,
EndLineCap = PenLineCap.Square,
StrokeStartLineCap = PenLineCap.Round,
StrokeEndLineCap = PenLineCap.Square,
Data = StreamGeometry.Parse("M 20,20 L 180,180"),
}
};

Loading…
Cancel
Save