Browse Source

Naming fixes

pull/1762/head
Benedikt Schroeder 8 years ago
parent
commit
f6c9aa88b9
  1. 4
      src/Avalonia.Controls/Remote/RemoteWidget.cs
  2. 6
      src/Avalonia.Visuals/Media/DrawingContext.cs
  3. 2
      src/Avalonia.Visuals/Media/Imaging/BitmapScalingMode.cs
  4. 3
      src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
  5. 5
      src/Avalonia.Visuals/Rendering/SceneGraph/ImageNode.cs
  6. 5
      src/Skia/Avalonia.Skia/DrawingContextImpl.cs
  7. 3
      src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
  8. 6
      tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
  9. 5
      tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs

4
src/Avalonia.Controls/Remote/RemoteWidget.cs

@ -9,9 +9,7 @@ using Avalonia.Threading;
using PixelFormat = Avalonia.Platform.PixelFormat; using PixelFormat = Avalonia.Platform.PixelFormat;
namespace Avalonia.Controls.Remote namespace Avalonia.Controls.Remote
{ {
using Avalonia.Visuals.Media.Imaging;
public class RemoteWidget : Control public class RemoteWidget : Control
{ {
private readonly IAvaloniaRemoteTransportConnection _connection; private readonly IAvaloniaRemoteTransportConnection _connection;

6
src/Avalonia.Visuals/Media/DrawingContext.cs

@ -69,12 +69,12 @@ namespace Avalonia.Media
/// <param name="opacity">The opacity to draw with.</param> /// <param name="opacity">The opacity to draw with.</param>
/// <param name="sourceRect">The rect in the image to draw.</param> /// <param name="sourceRect">The rect in the image to draw.</param>
/// <param name="destRect">The rect in the output to draw to.</param> /// <param name="destRect">The rect in the output to draw to.</param>
/// <param name="scalingMode"></param> /// <param name="bitmapScalingMode"></param>
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<ArgumentNullException>(source != null); Contract.Requires<ArgumentNullException>(source != null);
PlatformImpl.DrawImage(source.PlatformImpl, opacity, sourceRect, destRect, scalingMode); PlatformImpl.DrawImage(source.PlatformImpl, opacity, sourceRect, destRect, bitmapScalingMode);
} }
/// <summary> /// <summary>

2
src/Avalonia.Visuals/Media/Imaging/BitmapScalingMode.cs

@ -14,7 +14,7 @@ namespace Avalonia.Visuals.Media.Imaging
HighQuality, HighQuality,
/// <summary> /// <summary>
/// Good performance an decent image quality. /// Good performance and decent image quality.
/// </summary> /// </summary>
MediumQuality, MediumQuality,

3
src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs

@ -7,11 +7,10 @@ using Avalonia.Media;
using Avalonia.Platform; using Avalonia.Platform;
using Avalonia.Utilities; using Avalonia.Utilities;
using Avalonia.VisualTree; using Avalonia.VisualTree;
using Avalonia.Visuals.Media.Imaging;
namespace Avalonia.Rendering.SceneGraph namespace Avalonia.Rendering.SceneGraph
{ {
using Avalonia.Visuals.Media.Imaging;
/// <summary> /// <summary>
/// A drawing context which builds a scene graph. /// A drawing context which builds a scene graph.
/// </summary> /// </summary>

5
src/Avalonia.Visuals/Rendering/SceneGraph/ImageNode.cs

@ -4,11 +4,10 @@
using System; using System;
using Avalonia.Platform; using Avalonia.Platform;
using Avalonia.Utilities; using Avalonia.Utilities;
using Avalonia.Visuals.Media.Imaging;
namespace Avalonia.Rendering.SceneGraph namespace Avalonia.Rendering.SceneGraph
{ {
using Avalonia.Visuals.Media.Imaging;
/// <summary> /// <summary>
/// A node in the scene graph which represents an image draw. /// A node in the scene graph which represents an image draw.
/// </summary> /// </summary>
@ -75,7 +74,7 @@ namespace Avalonia.Rendering.SceneGraph
/// <param name="opacity">The opacity of the other draw operation.</param> /// <param name="opacity">The opacity of the other draw operation.</param>
/// <param name="sourceRect">The source rect of the other draw operation.</param> /// <param name="sourceRect">The source rect of the other draw operation.</param>
/// <param name="destRect">The dest rect of the other draw operation.</param> /// <param name="destRect">The dest rect of the other draw operation.</param>
/// <param name="bitmapScalingMode"></param> /// <param name="bitmapScalingMode">The bitmap scaling mode.</param>
/// <returns>True if the draw operations are the same, otherwise false.</returns> /// <returns>True if the draw operations are the same, otherwise false.</returns>
/// <remarks> /// <remarks>
/// The properties of the other draw operation are passed in as arguments to prevent /// The properties of the other draw operation are passed in as arguments to prevent

5
src/Skia/Avalonia.Skia/DrawingContextImpl.cs

@ -10,12 +10,11 @@ using Avalonia.Platform;
using Avalonia.Rendering; using Avalonia.Rendering;
using Avalonia.Rendering.Utilities; using Avalonia.Rendering.Utilities;
using Avalonia.Utilities; using Avalonia.Utilities;
using Avalonia.Visuals.Media.Imaging;
using SkiaSharp; using SkiaSharp;
namespace Avalonia.Skia namespace Avalonia.Skia
{ {
using Avalonia.Visuals.Media.Imaging;
/// <summary> /// <summary>
/// Skia based drawing context. /// Skia based drawing context.
/// </summary> /// </summary>

3
src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs

@ -7,14 +7,13 @@ using Avalonia.Media;
using Avalonia.Platform; using Avalonia.Platform;
using Avalonia.Rendering; using Avalonia.Rendering;
using Avalonia.Utilities; using Avalonia.Utilities;
using Avalonia.Visuals.Media.Imaging;
using SharpDX; using SharpDX;
using SharpDX.Direct2D1; using SharpDX.Direct2D1;
using SharpDX.Mathematics.Interop; using SharpDX.Mathematics.Interop;
namespace Avalonia.Direct2D1.Media namespace Avalonia.Direct2D1.Media
{ {
using Avalonia.Visuals.Media.Imaging;
/// <summary> /// <summary>
/// Draws using Direct2D1. /// Draws using Direct2D1.
/// </summary> /// </summary>

6
tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs

@ -2,6 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Reactive.Subjects; using System.Reactive.Subjects;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Data; using Avalonia.Data;
using Avalonia.Media; using Avalonia.Media;
@ -10,14 +11,15 @@ using Avalonia.Rendering;
using Avalonia.Rendering.SceneGraph; using Avalonia.Rendering.SceneGraph;
using Avalonia.Threading; using Avalonia.Threading;
using Avalonia.UnitTests; using Avalonia.UnitTests;
using Avalonia.Visuals.Media.Imaging;
using Avalonia.VisualTree; using Avalonia.VisualTree;
using Moq; using Moq;
using Xunit; using Xunit;
namespace Avalonia.Visuals.UnitTests.Rendering namespace Avalonia.Visuals.UnitTests.Rendering
{ {
using Avalonia.Visuals.Media.Imaging;
public class DeferredRendererTests public class DeferredRendererTests
{ {
[Fact] [Fact]

5
tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DrawOperationTests.cs

@ -3,13 +3,12 @@ using Avalonia.Media;
using Avalonia.Platform; using Avalonia.Platform;
using Avalonia.Rendering.SceneGraph; using Avalonia.Rendering.SceneGraph;
using Avalonia.Utilities; using Avalonia.Utilities;
using Avalonia.Visuals.Media.Imaging;
using Moq; using Moq;
using Xunit; using Xunit;
namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
{ {
using Avalonia.Visuals.Media.Imaging;
public class DrawOperationTests public class DrawOperationTests
{ {
[Fact] [Fact]

Loading…
Cancel
Save