From f4f3d572a621ef48f3f0f0ec2634522f6247c634 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Wed, 30 Sep 2015 15:04:58 +0300 Subject: [PATCH] Renamed IRenderingViewport to IRenderTarget --- src/Gtk/Perspex.Cairo/CairoPlatform.cs | 4 ++-- .../Media/Imaging/RenderTargetBitmapImpl.cs | 8 ++++---- src/Gtk/Perspex.Cairo/Media/TileBrushes.cs | 2 +- src/Gtk/Perspex.Cairo/Perspex.Cairo.csproj | 2 +- .../{Viewport.cs => RenderTarget.cs} | 8 ++++---- src/Perspex.Controls/TopLevel.cs | 4 ++-- .../Perspex.SceneGraph.csproj | 2 +- .../Platform/IPlatformRenderInterface.cs | 4 ++-- ...IRenderingViewport.cs => IRenderTarget.cs} | 2 +- .../Rendering/RendererBase.cs | 20 +++++++++---------- src/Perspex.SceneGraph/Visual.cs | 2 +- .../Perspex.Direct2D1/Direct2D1Platform.cs | 4 ++-- .../Perspex.Direct2D1/Media/DrawingContext.cs | 4 ++-- .../Perspex.Direct2D1/Media/ImageBrushImpl.cs | 4 ++-- .../Media/Imaging/RenderTargetBitmapImpl.cs | 4 ++-- .../Media/PerspexTextRenderer.cs | 4 ++-- .../Media/VisualBrushImpl.cs | 4 ++-- .../Perspex.Direct2D1.csproj | 2 +- .../Perspex.Direct2D1/PrimitiveExtensions.cs | 2 +- .../{Viewport.cs => RenderTarget.cs} | 12 +++++------ .../ControlTests.cs | 2 +- tests/Perspex.Controls.UnitTests/TestRoot.cs | 2 +- .../Perspex.SceneGraph.UnitTests/TestRoot.cs | 2 +- 23 files changed, 52 insertions(+), 52 deletions(-) rename src/Gtk/Perspex.Cairo/{Viewport.cs => RenderTarget.cs} (89%) rename src/Perspex.SceneGraph/Platform/{IRenderingViewport.cs => IRenderTarget.cs} (95%) rename src/Windows/Perspex.Direct2D1/{Viewport.cs => RenderTarget.cs} (88%) diff --git a/src/Gtk/Perspex.Cairo/CairoPlatform.cs b/src/Gtk/Perspex.Cairo/CairoPlatform.cs index 7d4b5421ee..ba0d8881c1 100644 --- a/src/Gtk/Perspex.Cairo/CairoPlatform.cs +++ b/src/Gtk/Perspex.Cairo/CairoPlatform.cs @@ -36,9 +36,9 @@ namespace Perspex.Cairo return new FormattedTextImpl(s_pangoContext, text, fontFamily, fontSize, fontStyle, textAlignment, fontWeight); } - public IRenderingViewport CreateRenderer(IPlatformHandle handle, double width, double height) + public IRenderTarget CreateRenderer(IPlatformHandle handle, double width, double height) { - return new Viewport(handle, width, height); + return new RenderTarget(handle, width, height); } public IRenderTargetBitmapImpl CreateRenderTargetBitmap(int width, int height) diff --git a/src/Gtk/Perspex.Cairo/Media/Imaging/RenderTargetBitmapImpl.cs b/src/Gtk/Perspex.Cairo/Media/Imaging/RenderTargetBitmapImpl.cs index a35c037875..452ee67854 100644 --- a/src/Gtk/Perspex.Cairo/Media/Imaging/RenderTargetBitmapImpl.cs +++ b/src/Gtk/Perspex.Cairo/Media/Imaging/RenderTargetBitmapImpl.cs @@ -14,7 +14,7 @@ namespace Perspex.Cairo.Media.Imaging public RenderTargetBitmapImpl(Cairo.ImageSurface surface) { Surface = surface; - viewport = new Viewport(Surface); + renderTarget = new RenderTarget(Surface); } public int PixelWidth => Surface.Width; @@ -23,7 +23,7 @@ namespace Perspex.Cairo.Media.Imaging public void Dispose() { - viewport.Dispose(); + renderTarget.Dispose(); } public Cairo.ImageSurface Surface @@ -31,10 +31,10 @@ namespace Perspex.Cairo.Media.Imaging get; } - private Viewport viewport; + private RenderTarget renderTarget; public void Render(IVisual visual) { - viewport.Render(visual, new PlatformHandle(IntPtr.Zero, "RTB")); + renderTarget.Render(visual, new PlatformHandle(IntPtr.Zero, "RTB")); } public void Save(string fileName) diff --git a/src/Gtk/Perspex.Cairo/Media/TileBrushes.cs b/src/Gtk/Perspex.Cairo/Media/TileBrushes.cs index 0a4c20246f..77710a3282 100644 --- a/src/Gtk/Perspex.Cairo/Media/TileBrushes.cs +++ b/src/Gtk/Perspex.Cairo/Media/TileBrushes.cs @@ -111,7 +111,7 @@ namespace Perspex.Cairo.Media scale, translate, out drawRect); - var renderer = new Viewport(intermediate); + var renderer = new RenderTarget(intermediate); context.Rectangle(drawRect.ToCairo()); context.Clip(); diff --git a/src/Gtk/Perspex.Cairo/Perspex.Cairo.csproj b/src/Gtk/Perspex.Cairo/Perspex.Cairo.csproj index 3f5d54a26a..77deb8f6b3 100644 --- a/src/Gtk/Perspex.Cairo/Perspex.Cairo.csproj +++ b/src/Gtk/Perspex.Cairo/Perspex.Cairo.csproj @@ -61,7 +61,7 @@ - + diff --git a/src/Gtk/Perspex.Cairo/Viewport.cs b/src/Gtk/Perspex.Cairo/RenderTarget.cs similarity index 89% rename from src/Gtk/Perspex.Cairo/Viewport.cs rename to src/Gtk/Perspex.Cairo/RenderTarget.cs index 2191611f15..1b428e36f4 100644 --- a/src/Gtk/Perspex.Cairo/Viewport.cs +++ b/src/Gtk/Perspex.Cairo/RenderTarget.cs @@ -15,22 +15,22 @@ namespace Perspex.Cairo /// /// A cairo renderer. /// - public class Viewport : IRenderingViewport + public class RenderTarget : IRenderTarget { private readonly Surface _surface; private Gdk.Window _window; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The window handle. /// The width of the window. /// The height of the window. - public Viewport(IPlatformHandle handle, double width, double height) + public RenderTarget(IPlatformHandle handle, double width, double height) { } - public Viewport(ImageSurface surface) + public RenderTarget(ImageSurface surface) { _surface = surface; } diff --git a/src/Perspex.Controls/TopLevel.cs b/src/Perspex.Controls/TopLevel.cs index a34d7a1ad0..1c0ac1e525 100644 --- a/src/Perspex.Controls/TopLevel.cs +++ b/src/Perspex.Controls/TopLevel.cs @@ -45,7 +45,7 @@ namespace Perspex.Controls PerspexProperty.Register(nameof(IInputRoot.PointerOverElement)); private readonly IRenderQueueManager _renderQueueManager; - private readonly IRenderingViewport _viewport; + private readonly IRenderTarget _renderTarget; private readonly IInputManager _inputManager; private readonly IAccessKeyHandler _accessKeyHandler; private readonly IKeyboardNavigationHandler _keyboardNavigationHandler; @@ -107,7 +107,7 @@ namespace Perspex.Controls if (renderInterface != null) { - _viewport = renderInterface.CreateRenderer(PlatformImpl.Handle, clientSize.Width, clientSize.Height); + _renderTarget = renderInterface.CreateRenderer(PlatformImpl.Handle, clientSize.Width, clientSize.Height); } if (LayoutManager != null) diff --git a/src/Perspex.SceneGraph/Perspex.SceneGraph.csproj b/src/Perspex.SceneGraph/Perspex.SceneGraph.csproj index dafed3ddd9..7824b398e6 100644 --- a/src/Perspex.SceneGraph/Perspex.SceneGraph.csproj +++ b/src/Perspex.SceneGraph/Perspex.SceneGraph.csproj @@ -105,7 +105,7 @@ - + diff --git a/src/Perspex.SceneGraph/Platform/IPlatformRenderInterface.cs b/src/Perspex.SceneGraph/Platform/IPlatformRenderInterface.cs index 9adf05e2e4..e79da32923 100644 --- a/src/Perspex.SceneGraph/Platform/IPlatformRenderInterface.cs +++ b/src/Perspex.SceneGraph/Platform/IPlatformRenderInterface.cs @@ -49,8 +49,8 @@ namespace Perspex.Platform /// The platform handle for the renderer. /// The initial width of the render. /// The initial height of the render. - /// An . - IRenderingViewport CreateRenderer(IPlatformHandle handle, double width, double height); + /// An . + IRenderTarget CreateRenderer(IPlatformHandle handle, double width, double height); /// /// Creates a render target bitmap implementation. diff --git a/src/Perspex.SceneGraph/Platform/IRenderingViewport.cs b/src/Perspex.SceneGraph/Platform/IRenderTarget.cs similarity index 95% rename from src/Perspex.SceneGraph/Platform/IRenderingViewport.cs rename to src/Perspex.SceneGraph/Platform/IRenderTarget.cs index ef9a8452e7..2ea2889348 100644 --- a/src/Perspex.SceneGraph/Platform/IRenderingViewport.cs +++ b/src/Perspex.SceneGraph/Platform/IRenderTarget.cs @@ -15,7 +15,7 @@ namespace Perspex.Platform /// as RenderBase has a default implementation for the non-platform specific parts of a /// renderer. /// - public interface IRenderingViewport : IDisposable + public interface IRenderTarget : IDisposable { /// /// Creates an for a rendering session. diff --git a/src/Perspex.SceneGraph/Rendering/RendererBase.cs b/src/Perspex.SceneGraph/Rendering/RendererBase.cs index e0a886f66f..3f254afe61 100644 --- a/src/Perspex.SceneGraph/Rendering/RendererBase.cs +++ b/src/Perspex.SceneGraph/Rendering/RendererBase.cs @@ -12,47 +12,47 @@ namespace Perspex.Rendering /// Base class for standard renderers. /// /// - /// This class provides implements the platform-independent parts of . + /// This class provides implements the platform-independent parts of . /// public static class RendererMixin { /// /// Renders the specified visual. /// - /// IRenderer instance + /// IRenderer instance /// The visual to render. /// An optional platform-specific handle. - public static void Render(this IRenderingViewport viewport, IVisual visual, IPlatformHandle target) + public static void Render(this IRenderTarget renderTarget, IVisual visual, IPlatformHandle target) { - using (var ctx = viewport.CreateDrawingContext(target)) + using (var ctx = renderTarget.CreateDrawingContext(target)) ctx.Render(visual); } /// /// Renders the specified visual. /// - /// IRenderer instance + /// IRenderer instance /// An optional platform-specific handle. /// The visual to render. /// The current translation. /// The current transform. - public static void Render(this IRenderingViewport viewport, IVisual visual, IPlatformHandle target, Matrix translation, Matrix transform) + public static void Render(this IRenderTarget renderTarget, IVisual visual, IPlatformHandle target, Matrix translation, Matrix transform) { - using (var ctx = viewport.CreateDrawingContext(target)) + using (var ctx = renderTarget.CreateDrawingContext(target)) ctx.Render(visual, translation, transform); } /// /// Renders the specified visual with the specified transform and clip. /// - /// IRenderer instance + /// IRenderer instance /// An optional platform-specific handle. /// The visual to render. /// The transform. /// An optional clip rectangle. - public static void Render(this IRenderingViewport viewport, IVisual visual, IPlatformHandle target, Matrix transform, Rect? clip = null) + public static void Render(this IRenderTarget renderTarget, IVisual visual, IPlatformHandle target, Matrix transform, Rect? clip = null) { - using (var context = viewport.CreateDrawingContext(target)) + using (var context = renderTarget.CreateDrawingContext(target)) context.Render(visual, transform, clip); } diff --git a/src/Perspex.SceneGraph/Visual.cs b/src/Perspex.SceneGraph/Visual.cs index 45ac797d99..e835c6a76c 100644 --- a/src/Perspex.SceneGraph/Visual.cs +++ b/src/Perspex.SceneGraph/Visual.cs @@ -22,7 +22,7 @@ namespace Perspex /// /// /// The class acts as a node in the Perspex scene graph and holds - /// all the information needed for an to render the control. + /// all the information needed for an to render the control. /// To traverse the scene graph (aka Visual Tree), use the extension methods defined /// in . /// diff --git a/src/Windows/Perspex.Direct2D1/Direct2D1Platform.cs b/src/Windows/Perspex.Direct2D1/Direct2D1Platform.cs index 65aa0b06d6..fef168bd27 100644 --- a/src/Windows/Perspex.Direct2D1/Direct2D1Platform.cs +++ b/src/Windows/Perspex.Direct2D1/Direct2D1Platform.cs @@ -41,11 +41,11 @@ namespace Perspex.Direct2D1 return new FormattedTextImpl(text, fontFamily, fontSize, fontStyle, textAlignment, fontWeight); } - public IRenderingViewport CreateRenderer(IPlatformHandle handle, double width, double height) + public IRenderTarget CreateRenderer(IPlatformHandle handle, double width, double height) { if (handle.HandleDescriptor == "HWND") { - return new Viewport(handle.Handle, width, height); + return new RenderTarget(handle.Handle, width, height); } else { diff --git a/src/Windows/Perspex.Direct2D1/Media/DrawingContext.cs b/src/Windows/Perspex.Direct2D1/Media/DrawingContext.cs index 039f6c30e0..0b6abe9353 100644 --- a/src/Windows/Perspex.Direct2D1/Media/DrawingContext.cs +++ b/src/Windows/Perspex.Direct2D1/Media/DrawingContext.cs @@ -18,7 +18,7 @@ namespace Perspex.Direct2D1.Media /// /// The Direct2D1 render target. /// - private readonly RenderTarget _renderTarget; + private readonly SharpDX.Direct2D1.RenderTarget _renderTarget; /// /// The DirectWrite factory. @@ -31,7 +31,7 @@ namespace Perspex.Direct2D1.Media /// The render target to draw to. /// The DirectWrite factory. public DrawingContext( - RenderTarget renderTarget, + SharpDX.Direct2D1.RenderTarget renderTarget, SharpDX.DirectWrite.Factory directWriteFactory) { _renderTarget = renderTarget; diff --git a/src/Windows/Perspex.Direct2D1/Media/ImageBrushImpl.cs b/src/Windows/Perspex.Direct2D1/Media/ImageBrushImpl.cs index bbadb758c4..c518b6438f 100644 --- a/src/Windows/Perspex.Direct2D1/Media/ImageBrushImpl.cs +++ b/src/Windows/Perspex.Direct2D1/Media/ImageBrushImpl.cs @@ -11,7 +11,7 @@ namespace Perspex.Direct2D1.Media { public ImageBrushImpl( ImageBrush brush, - RenderTarget target, + SharpDX.Direct2D1.RenderTarget target, Size targetSize) { if (brush.Source == null) @@ -59,7 +59,7 @@ namespace Perspex.Direct2D1.Media private BitmapBrush CreateDirectBrush( ImageBrush brush, - RenderTarget target, + SharpDX.Direct2D1.RenderTarget target, Bitmap image, Rect sourceRect, Rect destinationRect) diff --git a/src/Windows/Perspex.Direct2D1/Media/Imaging/RenderTargetBitmapImpl.cs b/src/Windows/Perspex.Direct2D1/Media/Imaging/RenderTargetBitmapImpl.cs index 3faaf762d8..c08d48e225 100644 --- a/src/Windows/Perspex.Direct2D1/Media/Imaging/RenderTargetBitmapImpl.cs +++ b/src/Windows/Perspex.Direct2D1/Media/Imaging/RenderTargetBitmapImpl.cs @@ -39,8 +39,8 @@ namespace Perspex.Direct2D1.Media public void Render(IVisual visual) { - Viewport viewport = new Viewport(_target); - viewport.Render(visual, null); + RenderTarget renderTarget = new RenderTarget(_target); + renderTarget.Render(visual, null); } } } diff --git a/src/Windows/Perspex.Direct2D1/Media/PerspexTextRenderer.cs b/src/Windows/Perspex.Direct2D1/Media/PerspexTextRenderer.cs index dbd56cfa4d..297dcdb581 100644 --- a/src/Windows/Perspex.Direct2D1/Media/PerspexTextRenderer.cs +++ b/src/Windows/Perspex.Direct2D1/Media/PerspexTextRenderer.cs @@ -12,13 +12,13 @@ namespace Perspex.Direct2D1.Media { private readonly DrawingContext _context; - private readonly RenderTarget _renderTarget; + private readonly SharpDX.Direct2D1.RenderTarget _renderTarget; private readonly Brush _foreground; public PerspexTextRenderer( DrawingContext context, - RenderTarget target, + SharpDX.Direct2D1.RenderTarget target, Brush foreground) { _context = context; diff --git a/src/Windows/Perspex.Direct2D1/Media/VisualBrushImpl.cs b/src/Windows/Perspex.Direct2D1/Media/VisualBrushImpl.cs index 8380b9c200..5bb191a4bc 100644 --- a/src/Windows/Perspex.Direct2D1/Media/VisualBrushImpl.cs +++ b/src/Windows/Perspex.Direct2D1/Media/VisualBrushImpl.cs @@ -13,7 +13,7 @@ namespace Perspex.Direct2D1.Media { public VisualBrushImpl( VisualBrush brush, - RenderTarget target, + SharpDX.Direct2D1.RenderTarget target, Size targetSize) { var visual = brush.Visual; @@ -51,7 +51,7 @@ namespace Perspex.Direct2D1.Media scale, translate, out drawRect); - var renderer = new Viewport(intermediate); + var renderer = new RenderTarget(intermediate); renderer.Render(visual, null, transform, drawRect); diff --git a/src/Windows/Perspex.Direct2D1/Perspex.Direct2D1.csproj b/src/Windows/Perspex.Direct2D1/Perspex.Direct2D1.csproj index eecdaeef6a..0f4ec68289 100644 --- a/src/Windows/Perspex.Direct2D1/Perspex.Direct2D1.csproj +++ b/src/Windows/Perspex.Direct2D1/Perspex.Direct2D1.csproj @@ -89,7 +89,7 @@ - + diff --git a/src/Windows/Perspex.Direct2D1/PrimitiveExtensions.cs b/src/Windows/Perspex.Direct2D1/PrimitiveExtensions.cs index 2364521ed0..fac270dd7c 100644 --- a/src/Windows/Perspex.Direct2D1/PrimitiveExtensions.cs +++ b/src/Windows/Perspex.Direct2D1/PrimitiveExtensions.cs @@ -69,7 +69,7 @@ namespace Perspex.Direct2D1 /// The pen to convert. /// The render target. /// The Direct2D brush. - public static StrokeStyle ToDirect2DStrokeStyle(this Perspex.Media.Pen pen, RenderTarget target) + public static StrokeStyle ToDirect2DStrokeStyle(this Perspex.Media.Pen pen, SharpDX.Direct2D1.RenderTarget target) { if (pen.DashStyle != null) { diff --git a/src/Windows/Perspex.Direct2D1/Viewport.cs b/src/Windows/Perspex.Direct2D1/RenderTarget.cs similarity index 88% rename from src/Windows/Perspex.Direct2D1/Viewport.cs rename to src/Windows/Perspex.Direct2D1/RenderTarget.cs index e53a1c8b91..95259f324b 100644 --- a/src/Windows/Perspex.Direct2D1/Viewport.cs +++ b/src/Windows/Perspex.Direct2D1/RenderTarget.cs @@ -12,20 +12,20 @@ using DwFactory = SharpDX.DirectWrite.Factory; namespace Perspex.Direct2D1 { - public class Viewport : IRenderingViewport + public class RenderTarget : IRenderTarget { /// /// The render target. /// - private readonly RenderTarget _renderTarget; + private readonly SharpDX.Direct2D1.RenderTarget _renderTarget; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The window handle. /// The width of the window. /// The height of the window. - public Viewport(IntPtr hwnd, double width, double height) + public RenderTarget(IntPtr hwnd, double width, double height) { Direct2DFactory = PerspexLocator.Current.GetService(); DirectWriteFactory = PerspexLocator.Current.GetService(); @@ -48,10 +48,10 @@ namespace Perspex.Direct2D1 } /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The render target. - public Viewport(RenderTarget renderTarget) + public RenderTarget(SharpDX.Direct2D1.RenderTarget renderTarget) { Direct2DFactory = PerspexLocator.Current.GetService(); DirectWriteFactory = PerspexLocator.Current.GetService(); diff --git a/tests/Perspex.Controls.UnitTests/ControlTests.cs b/tests/Perspex.Controls.UnitTests/ControlTests.cs index d031467ca2..d86733de3d 100644 --- a/tests/Perspex.Controls.UnitTests/ControlTests.cs +++ b/tests/Perspex.Controls.UnitTests/ControlTests.cs @@ -76,7 +76,7 @@ namespace Perspex.Controls.UnitTests get { throw new NotImplementedException(); } } - public IRenderingViewport Viewport + public IRenderTarget RenderTarget { get { throw new NotImplementedException(); } } diff --git a/tests/Perspex.Controls.UnitTests/TestRoot.cs b/tests/Perspex.Controls.UnitTests/TestRoot.cs index a35bfc50ce..10973f7c9c 100644 --- a/tests/Perspex.Controls.UnitTests/TestRoot.cs +++ b/tests/Perspex.Controls.UnitTests/TestRoot.cs @@ -15,7 +15,7 @@ namespace Perspex.Controls.UnitTests public ILayoutManager LayoutManager => new Mock().Object; - public IRenderingViewport Viewport + public IRenderTarget RenderTarget { get { throw new NotImplementedException(); } } diff --git a/tests/Perspex.SceneGraph.UnitTests/TestRoot.cs b/tests/Perspex.SceneGraph.UnitTests/TestRoot.cs index 8b447e42bb..99a1fd0d4a 100644 --- a/tests/Perspex.SceneGraph.UnitTests/TestRoot.cs +++ b/tests/Perspex.SceneGraph.UnitTests/TestRoot.cs @@ -9,7 +9,7 @@ namespace Perspex.SceneGraph.UnitTests { public class TestRoot : TestVisual, IRenderRoot { - public IRenderingViewport Viewport + public IRenderTarget RenderTarget { get { throw new NotImplementedException(); } }