diff --git a/src/Avalonia.Base/Media/StreamGeometryContext.cs b/src/Avalonia.Base/Media/StreamGeometryContext.cs index 8b51bf3676..66fb65a6c2 100644 --- a/src/Avalonia.Base/Media/StreamGeometryContext.cs +++ b/src/Avalonia.Base/Media/StreamGeometryContext.cs @@ -29,22 +29,13 @@ namespace Avalonia.Media /// Sets path's winding rule (default is EvenOdd). You should call this method before any calls to BeginFigure. If you wonder why, ask Direct2D guys about their design decisions. /// /// - public void SetFillRule(FillRule fillRule) { _impl.SetFillRule(fillRule); } - /// - /// Draws an arc to the specified point. - /// - /// The destination point. - /// The radii of an oval whose perimeter is used to draw the angle. - /// The rotation angle (in radians) of the oval that specifies the curve. - /// true to draw the arc greater than 180 degrees; otherwise, false. - /// - /// A value that indicates whether the arc is drawn in the Clockwise or Counterclockwise direction. - /// + + /// public void ArcTo(Point point, Size size, double rotationAngle, bool isLargeArc, SweepDirection sweepDirection) { _impl.ArcTo(point, size, rotationAngle, isLargeArc, sweepDirection); @@ -54,8 +45,8 @@ namespace Avalonia.Media /// /// Draws an arc to the specified point using polylines, quadratic or cubic Bezier curves - /// Significantly more precise when drawing elliptic arcs with extreme width:height ratios. - /// + /// Significantly more precise when drawing elliptic arcs with extreme width:height ratios. + /// /// The destination point. /// The radii of an oval whose perimeter is used to draw the angle. /// The rotation angle (in radians) of the oval that specifies the curve. @@ -68,54 +59,37 @@ namespace Avalonia.Media PreciseEllipticArcHelper.ArcTo(this, _currentPoint, point, size, rotationAngle, isLargeArc, sweepDirection); } - /// - /// Begins a new figure. - /// - /// The starting point for the figure. - /// Whether the figure is filled. + + /// public void BeginFigure(Point startPoint, bool isFilled) { _impl.BeginFigure(startPoint, isFilled); _currentPoint = startPoint; } - /// - /// Draws a Bezier curve to the specified point. - /// - /// The first control point used to specify the shape of the curve. - /// The second control point used to specify the shape of the curve. - /// The destination point for the end of the curve. - public void CubicBezierTo(Point point1, Point point2, Point point3) + /// + public void CubicBezierTo(Point controlPoint1, Point controlPoint2, Point endPoint) { - _impl.CubicBezierTo(point1, point2, point3); - _currentPoint = point3; + _impl.CubicBezierTo(controlPoint1, controlPoint2, endPoint); + _currentPoint = endPoint; } - /// - /// Draws a quadratic Bezier curve to the specified point - /// - /// The control point used to specify the shape of the curve. - /// The destination point for the end of the curve. - public void QuadraticBezierTo(Point control, Point endPoint) + /// + public void QuadraticBezierTo(Point controlPoint , Point endPoint) { - _impl.QuadraticBezierTo(control, endPoint); + _impl.QuadraticBezierTo(controlPoint , endPoint); _currentPoint = endPoint; } - /// - /// Draws a line to the specified point. - /// - /// The destination point. - public void LineTo(Point point) + + /// + public void LineTo(Point endPoint) { - _impl.LineTo(point); - _currentPoint = point; + _impl.LineTo(endPoint); + _currentPoint = endPoint; } - /// - /// Ends the figure started by . - /// - /// Whether the figure is closed. + /// public void EndFigure(bool isClosed) { _impl.EndFigure(isClosed); diff --git a/src/Avalonia.Base/Platform/IGeometryContext.cs b/src/Avalonia.Base/Platform/IGeometryContext.cs index 87db9f1dd4..614b331761 100644 --- a/src/Avalonia.Base/Platform/IGeometryContext.cs +++ b/src/Avalonia.Base/Platform/IGeometryContext.cs @@ -30,23 +30,23 @@ namespace Avalonia.Platform /// /// Draws a Bezier curve to the specified point. /// - /// The first control point used to specify the shape of the curve. - /// The second control point used to specify the shape of the curve. - /// The destination point for the end of the curve. - void CubicBezierTo(Point point1, Point point2, Point point3); + /// The first control point used to specify the shape of the curve. + /// The second control point used to specify the shape of the curve. + /// The destination point for the end of the curve. + void CubicBezierTo(Point controlPoint1, Point controlPoint2, Point endPoint); /// /// Draws a quadratic Bezier curve to the specified point /// - /// Control point + /// Control point /// DestinationPoint - void QuadraticBezierTo(Point control, Point endPoint); + void QuadraticBezierTo(Point controlPoint , Point endPoint); /// /// Draws a line to the specified point. /// - /// The destination point. - void LineTo(Point point); + /// The destination point. + void LineTo(Point endPoint); /// /// Ends the figure started by . @@ -55,9 +55,9 @@ namespace Avalonia.Platform void EndFigure(bool isClosed); /// - /// Sets the fill rule. + /// Sets path's winding rule (default is EvenOdd). You should call this method before any calls to BeginFigure. /// - /// The fill rule. + /// void SetFillRule(FillRule fillRule); } } diff --git a/src/Avalonia.Base/Platform/PathGeometryContext.cs b/src/Avalonia.Base/Platform/PathGeometryContext.cs index 694e9f8d80..bcb4f2a272 100644 --- a/src/Avalonia.Base/Platform/PathGeometryContext.cs +++ b/src/Avalonia.Base/Platform/PathGeometryContext.cs @@ -20,6 +20,7 @@ namespace Avalonia.Visuals.Platform _pathGeometry = null; } + /// public void ArcTo(Point point, Size size, double rotationAngle, bool isLargeArc, SweepDirection sweepDirection) { var arcSegment = new ArcSegment @@ -34,6 +35,7 @@ namespace Avalonia.Visuals.Platform CurrentFigureSegments().Add(arcSegment); } + /// public void BeginFigure(Point startPoint, bool isFilled) { ThrowIfDisposed(); @@ -44,30 +46,34 @@ namespace Avalonia.Visuals.Platform _pathGeometry.Figures.Add(_currentFigure); } - public void CubicBezierTo(Point point1, Point point2, Point point3) + /// + public void CubicBezierTo(Point controlPoint1, Point controlPoint2, Point endPoint) { - var bezierSegment = new BezierSegment { Point1 = point1, Point2 = point2, Point3 = point3 }; + var bezierSegment = new BezierSegment { Point1 = controlPoint1, Point2 = controlPoint2, Point3 = endPoint }; CurrentFigureSegments().Add(bezierSegment); } - public void QuadraticBezierTo(Point control, Point endPoint) + /// + public void QuadraticBezierTo(Point controlPoint , Point endPoint) { - var quadraticBezierSegment = new QuadraticBezierSegment { Point1 = control, Point2 = endPoint }; + var quadraticBezierSegment = new QuadraticBezierSegment { Point1 = controlPoint , Point2 = endPoint }; CurrentFigureSegments().Add(quadraticBezierSegment); } - public void LineTo(Point point) + /// + public void LineTo(Point endPoint) { var lineSegment = new LineSegment { - Point = point + Point = endPoint }; CurrentFigureSegments().Add(lineSegment); } + /// public void EndFigure(bool isClosed) { if (_currentFigure != null) @@ -78,6 +84,7 @@ namespace Avalonia.Visuals.Platform _currentFigure = null; } + /// public void SetFillRule(FillRule fillRule) { ThrowIfDisposed();