From b7ce031554b326552b0b276dcd9d258a4f2bb650 Mon Sep 17 00:00:00 2001 From: Amer Koleci Date: Mon, 21 Sep 2015 20:44:39 +0200 Subject: [PATCH] Fix code and remove useless null check. --- .../Media/RadialGradientBrush.cs | 2 +- .../Media/LinearGradientBrushImpl.cs | 21 +++++++-------- .../Media/RadialGradientBrushImpl.cs | 27 +++++++++---------- 3 files changed, 22 insertions(+), 28 deletions(-) diff --git a/src/Perspex.SceneGraph/Media/RadialGradientBrush.cs b/src/Perspex.SceneGraph/Media/RadialGradientBrush.cs index 694defb46a..f985ec4115 100644 --- a/src/Perspex.SceneGraph/Media/RadialGradientBrush.cs +++ b/src/Perspex.SceneGraph/Media/RadialGradientBrush.cs @@ -52,7 +52,7 @@ namespace Perspex.Media } /// - /// ets or sets the horizontal and vertical radius of the outermost circle of the radial gradient. + /// Gets or sets the horizontal and vertical radius of the outermost circle of the radial gradient. /// public double Radius { diff --git a/src/Windows/Perspex.Direct2D1/Media/LinearGradientBrushImpl.cs b/src/Windows/Perspex.Direct2D1/Media/LinearGradientBrushImpl.cs index 56ea0f422d..b67378990c 100644 --- a/src/Windows/Perspex.Direct2D1/Media/LinearGradientBrushImpl.cs +++ b/src/Windows/Perspex.Direct2D1/Media/LinearGradientBrushImpl.cs @@ -16,20 +16,17 @@ namespace Perspex.Direct2D1.Media SharpDX.Direct2D1.RenderTarget target, Size destinationSize) { - if (brush != null) - { - var gradientStops = brush.GradientStops.Select(s => new SharpDX.Direct2D1.GradientStop { Color = s.Color.ToDirect2D(), Position = (float)s.Offset }).ToArray(); + var gradientStops = brush.GradientStops.Select(s => new SharpDX.Direct2D1.GradientStop { Color = s.Color.ToDirect2D(), Position = (float)s.Offset }).ToArray(); - Point startPoint = brush.StartPoint.ToPixels(destinationSize); - Point endPoint = brush.EndPoint.ToPixels(destinationSize); + Point startPoint = brush.StartPoint.ToPixels(destinationSize); + Point endPoint = brush.EndPoint.ToPixels(destinationSize); - PlatformBrush = new SharpDX.Direct2D1.LinearGradientBrush( - target, - new SharpDX.Direct2D1.LinearGradientBrushProperties { StartPoint = startPoint.ToSharpDX(), EndPoint = endPoint.ToSharpDX() }, - new SharpDX.Direct2D1.BrushProperties { Opacity = (float)brush.Opacity, Transform = target.Transform }, - new SharpDX.Direct2D1.GradientStopCollection(target, gradientStops, brush.SpreadMethod.ToDirect2D()) - ); - } + PlatformBrush = new SharpDX.Direct2D1.LinearGradientBrush( + target, + new SharpDX.Direct2D1.LinearGradientBrushProperties { StartPoint = startPoint.ToSharpDX(), EndPoint = endPoint.ToSharpDX() }, + new SharpDX.Direct2D1.BrushProperties { Opacity = (float)brush.Opacity, Transform = target.Transform }, + new SharpDX.Direct2D1.GradientStopCollection(target, gradientStops, brush.SpreadMethod.ToDirect2D()) + ); } } } diff --git a/src/Windows/Perspex.Direct2D1/Media/RadialGradientBrushImpl.cs b/src/Windows/Perspex.Direct2D1/Media/RadialGradientBrushImpl.cs index f47bd99fe2..f0b21c7ae7 100644 --- a/src/Windows/Perspex.Direct2D1/Media/RadialGradientBrushImpl.cs +++ b/src/Windows/Perspex.Direct2D1/Media/RadialGradientBrushImpl.cs @@ -16,23 +16,20 @@ namespace Perspex.Direct2D1.Media SharpDX.Direct2D1.RenderTarget target, Size destinationSize) { - if (brush != null) - { - var gradientStops = brush.GradientStops.Select(s => new SharpDX.Direct2D1.GradientStop { Color = s.Color.ToDirect2D(), Position = (float)s.Offset }).ToArray(); + var gradientStops = brush.GradientStops.Select(s => new SharpDX.Direct2D1.GradientStop { Color = s.Color.ToDirect2D(), Position = (float)s.Offset }).ToArray(); - Point centerPoint = brush.Center.ToPixels(destinationSize); - Point GradientOriginOffset = brush.GradientOrigin.ToPixels(destinationSize); - // Note: Direct2D supports RadiusX and RadiusY but Cairo backend supports only Radius property - double radiusX = brush.Radius; - double radiusY = brush.Radius; + Point centerPoint = brush.Center.ToPixels(destinationSize); + Point GradientOriginOffset = brush.GradientOrigin.ToPixels(destinationSize); + // Note: Direct2D supports RadiusX and RadiusY but Cairo backend supports only Radius property + double radiusX = brush.Radius; + double radiusY = brush.Radius; - PlatformBrush = new SharpDX.Direct2D1.RadialGradientBrush( - target, - new SharpDX.Direct2D1.RadialGradientBrushProperties { Center = centerPoint.ToSharpDX(), GradientOriginOffset = GradientOriginOffset.ToSharpDX(), RadiusX = (float)radiusX, RadiusY = (float)radiusY }, - new SharpDX.Direct2D1.BrushProperties { Opacity = (float)brush.Opacity, Transform = target.Transform }, - new SharpDX.Direct2D1.GradientStopCollection(target, gradientStops, brush.SpreadMethod.ToDirect2D()) - ); - } + PlatformBrush = new SharpDX.Direct2D1.RadialGradientBrush( + target, + new SharpDX.Direct2D1.RadialGradientBrushProperties { Center = centerPoint.ToSharpDX(), GradientOriginOffset = GradientOriginOffset.ToSharpDX(), RadiusX = (float)radiusX, RadiusY = (float)radiusY }, + new SharpDX.Direct2D1.BrushProperties { Opacity = (float)brush.Opacity, Transform = target.Transform }, + new SharpDX.Direct2D1.GradientStopCollection(target, gradientStops, brush.SpreadMethod.ToDirect2D()) + ); } } }