From f6c9aa88b93c2b00e2b84ab951bba846e583b375 Mon Sep 17 00:00:00 2001 From: Benedikt Schroeder Date: Thu, 19 Jul 2018 10:04:28 +0200 Subject: [PATCH] Naming fixes --- src/Avalonia.Controls/Remote/RemoteWidget.cs | 4 +--- src/Avalonia.Visuals/Media/DrawingContext.cs | 6 +++--- src/Avalonia.Visuals/Media/Imaging/BitmapScalingMode.cs | 2 +- .../Rendering/SceneGraph/DeferredDrawingContextImpl.cs | 3 +-- src/Avalonia.Visuals/Rendering/SceneGraph/ImageNode.cs | 5 ++--- src/Skia/Avalonia.Skia/DrawingContextImpl.cs | 5 ++--- src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs | 3 +-- .../Rendering/DeferredRendererTests.cs | 6 ++++-- .../Rendering/SceneGraph/DrawOperationTests.cs | 5 ++--- 9 files changed, 17 insertions(+), 22 deletions(-) diff --git a/src/Avalonia.Controls/Remote/RemoteWidget.cs b/src/Avalonia.Controls/Remote/RemoteWidget.cs index 594208b51c..618a0c3f62 100644 --- a/src/Avalonia.Controls/Remote/RemoteWidget.cs +++ b/src/Avalonia.Controls/Remote/RemoteWidget.cs @@ -9,9 +9,7 @@ using Avalonia.Threading; using PixelFormat = Avalonia.Platform.PixelFormat; namespace Avalonia.Controls.Remote -{ - using Avalonia.Visuals.Media.Imaging; - +{ public class RemoteWidget : Control { private readonly IAvaloniaRemoteTransportConnection _connection; diff --git a/src/Avalonia.Visuals/Media/DrawingContext.cs b/src/Avalonia.Visuals/Media/DrawingContext.cs index 85e165be36..0d7d41e46e 100644 --- a/src/Avalonia.Visuals/Media/DrawingContext.cs +++ b/src/Avalonia.Visuals/Media/DrawingContext.cs @@ -69,12 +69,12 @@ namespace Avalonia.Media /// The opacity to draw with. /// The rect in the image to draw. /// The rect in the output to draw to. - /// - public void DrawImage(IBitmap source, double opacity, Rect sourceRect, Rect destRect, BitmapScalingMode scalingMode = default) + /// + public void DrawImage(IBitmap source, double opacity, Rect sourceRect, Rect destRect, BitmapScalingMode bitmapScalingMode = default) { Contract.Requires(source != null); - PlatformImpl.DrawImage(source.PlatformImpl, opacity, sourceRect, destRect, scalingMode); + PlatformImpl.DrawImage(source.PlatformImpl, opacity, sourceRect, destRect, bitmapScalingMode); } /// diff --git a/src/Avalonia.Visuals/Media/Imaging/BitmapScalingMode.cs b/src/Avalonia.Visuals/Media/Imaging/BitmapScalingMode.cs index 32b98c92a3..5c91dd993d 100644 --- a/src/Avalonia.Visuals/Media/Imaging/BitmapScalingMode.cs +++ b/src/Avalonia.Visuals/Media/Imaging/BitmapScalingMode.cs @@ -14,7 +14,7 @@ namespace Avalonia.Visuals.Media.Imaging HighQuality, /// - /// Good performance an decent image quality. + /// Good performance and decent image quality. /// MediumQuality, diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs index ac69687e60..fbd258fdbe 100644 --- a/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs +++ b/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs @@ -7,11 +7,10 @@ using Avalonia.Media; using Avalonia.Platform; using Avalonia.Utilities; using Avalonia.VisualTree; +using Avalonia.Visuals.Media.Imaging; namespace Avalonia.Rendering.SceneGraph { - using Avalonia.Visuals.Media.Imaging; - /// /// A drawing context which builds a scene graph. /// diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/ImageNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/ImageNode.cs index e896d9a015..db5c672b97 100644 --- a/src/Avalonia.Visuals/Rendering/SceneGraph/ImageNode.cs +++ b/src/Avalonia.Visuals/Rendering/SceneGraph/ImageNode.cs @@ -4,11 +4,10 @@ using System; using Avalonia.Platform; using Avalonia.Utilities; +using Avalonia.Visuals.Media.Imaging; namespace Avalonia.Rendering.SceneGraph { - using Avalonia.Visuals.Media.Imaging; - /// /// A node in the scene graph which represents an image draw. /// @@ -75,7 +74,7 @@ namespace Avalonia.Rendering.SceneGraph /// The opacity of the other draw operation. /// The source rect of the other draw operation. /// The dest rect of the other draw operation. - /// + /// The bitmap scaling mode. /// True if the draw operations are the same, otherwise false. /// /// The properties of the other draw operation are passed in as arguments to prevent diff --git a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs index 15ebf31754..f0e56a80cf 100644 --- a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs +++ b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs @@ -10,12 +10,11 @@ using Avalonia.Platform; using Avalonia.Rendering; using Avalonia.Rendering.Utilities; using Avalonia.Utilities; +using Avalonia.Visuals.Media.Imaging; using SkiaSharp; namespace Avalonia.Skia -{ - using Avalonia.Visuals.Media.Imaging; - +{ /// /// Skia based drawing context. /// diff --git a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs index 801f72b881..0bad70991d 100644 --- a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs +++ b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs @@ -7,14 +7,13 @@ using Avalonia.Media; using Avalonia.Platform; using Avalonia.Rendering; using Avalonia.Utilities; +using Avalonia.Visuals.Media.Imaging; using SharpDX; using SharpDX.Direct2D1; using SharpDX.Mathematics.Interop; namespace Avalonia.Direct2D1.Media { - using Avalonia.Visuals.Media.Imaging; - /// /// Draws using Direct2D1. /// diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs index 655888cf31..12ca2777ec 100644 --- a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs +++ b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Reactive.Subjects; + using Avalonia.Controls; using Avalonia.Data; using Avalonia.Media; @@ -10,14 +11,15 @@ using Avalonia.Rendering; using Avalonia.Rendering.SceneGraph; using Avalonia.Threading; using Avalonia.UnitTests; +using Avalonia.Visuals.Media.Imaging; using Avalonia.VisualTree; + using Moq; + using Xunit; namespace Avalonia.Visuals.UnitTests.Rendering { - using Avalonia.Visuals.Media.Imaging; - public class DeferredRendererTests { [Fact] diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs index 996cb289c8..664d240966 100644 --- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs +++ b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs @@ -3,13 +3,12 @@ using Avalonia.Media; using Avalonia.Platform; using Avalonia.Rendering.SceneGraph; using Avalonia.Utilities; +using Avalonia.Visuals.Media.Imaging; using Moq; using Xunit; namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph -{ - using Avalonia.Visuals.Media.Imaging; - +{ public class DrawOperationTests { [Fact]