From 4db7c8468028c1a55dcca24bf375382ae49167ff Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Thu, 12 Jun 2014 18:34:23 +0200 Subject: [PATCH] Stylecops --- Perspex.Direct2D1/Media/GeometryImpl.cs | 4 +- Perspex.Direct2D1/Media/StreamGeometryImpl.cs | 4 +- Perspex/Media/PathMarkupParser.cs | 56 +++++++++---------- Perspex/Media/StreamGeometry.cs | 10 ++-- Perspex/Shapes/Path.cs | 2 +- Perspex/Shapes/Shape.cs | 10 ++-- Perspex/Themes/Default/CheckBoxStyle.cs | 2 +- 7 files changed, 44 insertions(+), 44 deletions(-) diff --git a/Perspex.Direct2D1/Media/GeometryImpl.cs b/Perspex.Direct2D1/Media/GeometryImpl.cs index af308f20fb..26d7502f1e 100644 --- a/Perspex.Direct2D1/Media/GeometryImpl.cs +++ b/Perspex.Direct2D1/Media/GeometryImpl.cs @@ -1,6 +1,6 @@ // ----------------------------------------------------------------------- -// -// Copyright 2014 Tricycle. All rights reserved. +// +// Copyright 2014 MIT Licence. See licence.md for more information. // // ----------------------------------------------------------------------- diff --git a/Perspex.Direct2D1/Media/StreamGeometryImpl.cs b/Perspex.Direct2D1/Media/StreamGeometryImpl.cs index 43827810bf..efa8724f8c 100644 --- a/Perspex.Direct2D1/Media/StreamGeometryImpl.cs +++ b/Perspex.Direct2D1/Media/StreamGeometryImpl.cs @@ -1,6 +1,6 @@ // ----------------------------------------------------------------------- -// -// Copyright 2014 Tricycle. All rights reserved. +// +// Copyright 2014 MIT Licence. See licence.md for more information. // // ----------------------------------------------------------------------- diff --git a/Perspex/Media/PathMarkupParser.cs b/Perspex/Media/PathMarkupParser.cs index 9f33e98167..4b58f0f11c 100644 --- a/Perspex/Media/PathMarkupParser.cs +++ b/Perspex/Media/PathMarkupParser.cs @@ -96,34 +96,34 @@ namespace Perspex.Media this.context.LineTo(point); break; - //case Command.HorizontalLine: - // point.X = ReadDouble(reader); - // this.context.LineTo(point, true, false); - // break; - - //case Command.HorizontalLineRelative: - // point.X += ReadDouble(reader); - // this.context.LineTo(point, true, false); - // break; - - //case Command.VerticalLine: - // point.Y = ReadDouble(reader); - // this.context.LineTo(point, true, false); - // break; - - //case Command.VerticalLineRelative: - // point.Y += ReadDouble(reader); - // this.context.LineTo(point, true, false); - // break; - - //case Command.CubicBezierCurve: - //{ - // Point point1 = ReadPoint(reader); - // Point point2 = ReadPoint(reader); - // point = ReadPoint(reader); - // this.context.BezierTo(point1, point2, point, true, false); - // break; - //} + ////case Command.HorizontalLine: + //// point.X = ReadDouble(reader); + //// this.context.LineTo(point, true, false); + //// break; + + ////case Command.HorizontalLineRelative: + //// point.X += ReadDouble(reader); + //// this.context.LineTo(point, true, false); + //// break; + + ////case Command.VerticalLine: + //// point.Y = ReadDouble(reader); + //// this.context.LineTo(point, true, false); + //// break; + + ////case Command.VerticalLineRelative: + //// point.Y += ReadDouble(reader); + //// this.context.LineTo(point, true, false); + //// break; + + ////case Command.CubicBezierCurve: + ////{ + //// Point point1 = ReadPoint(reader); + //// Point point2 = ReadPoint(reader); + //// point = ReadPoint(reader); + //// this.context.BezierTo(point1, point2, point, true, false); + //// break; + ////} case Command.Close: this.context.EndFigure(true); diff --git a/Perspex/Media/StreamGeometry.cs b/Perspex/Media/StreamGeometry.cs index b0384bd7ff..2ff2f52846 100644 --- a/Perspex/Media/StreamGeometry.cs +++ b/Perspex/Media/StreamGeometry.cs @@ -16,6 +16,11 @@ namespace Perspex.Media this.PlatformImpl = Locator.Current.GetService(); } + public override Rect Bounds + { + get { return this.PlatformImpl.Bounds; } + } + public static StreamGeometry Parse(string s) { StreamGeometry result = new StreamGeometry(); @@ -28,11 +33,6 @@ namespace Perspex.Media } } - public override Rect Bounds - { - get { return this.PlatformImpl.Bounds; } - } - public StreamGeometryContext Open() { return new StreamGeometryContext(((IStreamGeometryImpl)this.PlatformImpl).Open()); diff --git a/Perspex/Shapes/Path.cs b/Perspex/Shapes/Path.cs index 8173042ce2..b0ba2d0897 100644 --- a/Perspex/Shapes/Path.cs +++ b/Perspex/Shapes/Path.cs @@ -11,7 +11,7 @@ namespace Perspex.Shapes public class Path : Shape { - public PerspexProperty DataProperty = + public static readonly PerspexProperty DataProperty = PerspexProperty.Register("Data"); public Geometry Data diff --git a/Perspex/Shapes/Shape.cs b/Perspex/Shapes/Shape.cs index 904dbe88a9..ea668338d0 100644 --- a/Perspex/Shapes/Shape.cs +++ b/Perspex/Shapes/Shape.cs @@ -1,5 +1,5 @@ // ----------------------------------------------------------------------- -// +// // Copyright 2014 MIT Licence. See licence.md for more information. // // ----------------------------------------------------------------------- @@ -12,16 +12,16 @@ namespace Perspex.Shapes public abstract class Shape : Control { - public PerspexProperty FillProperty = + public static readonly PerspexProperty FillProperty = PerspexProperty.Register("Fill"); - public PerspexProperty StretchProperty = + public static readonly PerspexProperty StretchProperty = PerspexProperty.Register("Stretch"); - public PerspexProperty StrokeProperty = + public static readonly PerspexProperty StrokeProperty = PerspexProperty.Register("Stroke"); - public PerspexProperty StrokeThicknessProperty = + public static readonly PerspexProperty StrokeThicknessProperty = PerspexProperty.Register("StrokeThickness"); public abstract Geometry DefiningGeometry diff --git a/Perspex/Themes/Default/CheckBoxStyle.cs b/Perspex/Themes/Default/CheckBoxStyle.cs index b088b8a148..50264b3991 100644 --- a/Perspex/Themes/Default/CheckBoxStyle.cs +++ b/Perspex/Themes/Default/CheckBoxStyle.cs @@ -1,5 +1,5 @@ // ----------------------------------------------------------------------- -// +// // Copyright 2014 MIT Licence. See licence.md for more information. // // -----------------------------------------------------------------------