Renamed IRenderingViewport to IRenderTarget

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)

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)

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();

src/Gtk/Perspex.Cairo/Perspex.Cairo.csproj

@@ -61,7 +61,7 @@
     <Compile Include="Media\RadialGradientBrushImpl.cs" />
     <Compile Include="Media\TileBrushes.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Viewport.cs" />
+    <Compile Include="RenderTarget.cs" />
     <Compile Include="CairoExtensions.cs" />
     <Compile Include="Media\StreamGeometryContextImpl.cs" />
     <Compile Include="Media\StreamGeometryImpl.cs" />

src/Gtk/Perspex.Cairo/Viewport.cs → src/Gtk/Perspex.Cairo/RenderTarget.cs

@@ -15,22 +15,22 @@ namespace Perspex.Cairo
     /// <summary>
     /// A cairo renderer.
     /// </summary>
-    public class Viewport : IRenderingViewport
+    public class RenderTarget : IRenderTarget
     {
         private readonly Surface _surface;
         private Gdk.Window _window;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Viewport"/> class.
+        /// Initializes a new instance of the <see cref="RenderTarget"/> class.
         /// </summary>
         /// <param name="handle">The window handle.</param>
         /// <param name="width">The width of the window.</param>
         /// <param name="height">The height of the window.</param>
-        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;
         }

src/Perspex.Controls/TopLevel.cs

@@ -45,7 +45,7 @@ namespace Perspex.Controls
             PerspexProperty.Register<TopLevel, IInputElement>(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)

src/Perspex.SceneGraph/Perspex.SceneGraph.csproj

@@ -105,7 +105,7 @@
     <Compile Include="Platform\IBitmapImpl.cs" />
     <Compile Include="Platform\IGeometryImpl.cs" />
     <Compile Include="Platform\IPlatformRenderInterface.cs" />
-    <Compile Include="Platform\IRenderingViewport.cs" />
+    <Compile Include="Platform\IRenderTarget.cs" />
     <Compile Include="Platform\IRenderTargetBitmapImpl.cs" />
     <Compile Include="Platform\IStreamGeometryContextImpl.cs" />
     <Compile Include="Platform\IStreamGeometryImpl.cs" />

src/Perspex.SceneGraph/Platform/IPlatformRenderInterface.cs

@@ -49,8 +49,8 @@ namespace Perspex.Platform
         /// <param name="handle">The platform handle for the renderer.</param>
         /// <param name="width">The initial width of the render.</param>
         /// <param name="height">The initial height of the render.</param>
-        /// <returns>An <see cref="IRenderingViewport"/>.</returns>
-        IRenderingViewport CreateRenderer(IPlatformHandle handle, double width, double height);
+        /// <returns>An <see cref="IRenderTarget"/>.</returns>
+        IRenderTarget CreateRenderer(IPlatformHandle handle, double width, double height);
 
         /// <summary>
         /// Creates a render target bitmap implementation.

src/Perspex.SceneGraph/Platform/IRenderingViewport.cs → 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.
     /// </remarks>
-    public interface IRenderingViewport : IDisposable
+    public interface IRenderTarget : IDisposable
     {
         /// <summary>
         /// Creates an <see cref="IDrawingContext"/> for a rendering session.

src/Perspex.SceneGraph/Rendering/RendererBase.cs

@@ -12,47 +12,47 @@ namespace Perspex.Rendering
     /// Base class for standard renderers.
     /// </summary>
     /// <remarks>
-    /// This class provides implements the platform-independent parts of <see cref="IRenderingViewport"/>.
+    /// This class provides implements the platform-independent parts of <see cref="IRenderTarget"/>.
     /// </remarks>
     public static class RendererMixin
     {
         /// <summary>
         /// Renders the specified visual.
         /// </summary>
-        /// <param name="viewport">IRenderer instance</param>
+        /// <param name="renderTarget">IRenderer instance</param>
         /// <param name="visual">The visual to render.</param>
         /// <param name="target">An optional platform-specific handle.</param>
-        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);
         }
 
         /// <summary>
         /// Renders the specified visual.
         /// </summary>
-        /// <param name="viewport">IRenderer instance</param>
+        /// <param name="renderTarget">IRenderer instance</param>
         /// <param name="target">An optional platform-specific handle.</param>
         /// <param name="visual">The visual to render.</param>
         /// <param name="translation">The current translation.</param>
         /// <param name="transform">The current transform.</param>
-        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);
         }
 
         /// <summary>
         /// Renders the specified visual with the specified transform and clip.
         /// </summary>
-        /// <param name="viewport">IRenderer instance</param>
+        /// <param name="renderTarget">IRenderer instance</param>
         /// <param name="target">An optional platform-specific handle.</param>
         /// <param name="visual">The visual to render.</param>
         /// <param name="transform">The transform.</param>
         /// <param name="clip">An optional clip rectangle.</param>
-        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);
         }
 

src/Perspex.SceneGraph/Visual.cs

@@ -22,7 +22,7 @@ namespace Perspex
     /// </summary>
     /// <remarks>
     /// The <see cref="Visual"/> class acts as a node in the Perspex scene graph and holds
-    /// all the information needed for an <see cref="IRenderingViewport"/> to render the control.
+    /// all the information needed for an <see cref="IRenderTarget"/> to render the control.
     /// To traverse the scene graph (aka Visual Tree), use the extension methods defined
     /// in <see cref="VisualExtensions"/>.
     /// </remarks>

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
             {

src/Windows/Perspex.Direct2D1/Media/DrawingContext.cs

@@ -18,7 +18,7 @@ namespace Perspex.Direct2D1.Media
         /// <summary>
         /// The Direct2D1 render target.
         /// </summary>
-        private readonly RenderTarget _renderTarget;
+        private readonly SharpDX.Direct2D1.RenderTarget _renderTarget;
 
         /// <summary>
         /// The DirectWrite factory.
@@ -31,7 +31,7 @@ namespace Perspex.Direct2D1.Media
         /// <param name="renderTarget">The render target to draw to.</param>
         /// <param name="directWriteFactory">The DirectWrite factory.</param>
         public DrawingContext(
-            RenderTarget renderTarget,
+            SharpDX.Direct2D1.RenderTarget renderTarget,
             SharpDX.DirectWrite.Factory directWriteFactory)
         {
             _renderTarget = renderTarget;

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)

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);
         }
     }
 }

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;

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);
 

src/Windows/Perspex.Direct2D1/Perspex.Direct2D1.csproj

@@ -89,7 +89,7 @@
     <Compile Include="Media\FormattedTextImpl.cs" />
     <Compile Include="PrimitiveExtensions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Viewport.cs" />
+    <Compile Include="RenderTarget.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />

src/Windows/Perspex.Direct2D1/PrimitiveExtensions.cs

@@ -69,7 +69,7 @@ namespace Perspex.Direct2D1
         /// <param name="pen">The pen to convert.</param>
         /// <param name="target">The render target.</param>
         /// <returns>The Direct2D brush.</returns>
-        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)
             {

src/Windows/Perspex.Direct2D1/Viewport.cs → 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
     {
         /// <summary>
         /// The render target.
         /// </summary>
-        private readonly RenderTarget _renderTarget;
+        private readonly SharpDX.Direct2D1.RenderTarget _renderTarget;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Viewport"/> class.
+        /// Initializes a new instance of the <see cref="RenderTarget"/> class.
         /// </summary>
         /// <param name="hwnd">The window handle.</param>
         /// <param name="width">The width of the window.</param>
         /// <param name="height">The height of the window.</param>
-        public Viewport(IntPtr hwnd, double width, double height)
+        public RenderTarget(IntPtr hwnd, double width, double height)
         {
             Direct2DFactory = PerspexLocator.Current.GetService<Factory>();
             DirectWriteFactory = PerspexLocator.Current.GetService<DwFactory>();
@@ -48,10 +48,10 @@ namespace Perspex.Direct2D1
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Viewport"/> class.
+        /// Initializes a new instance of the <see cref="RenderTarget"/> class.
         /// </summary>
         /// <param name="renderTarget">The render target.</param>
-        public Viewport(RenderTarget renderTarget)
+        public RenderTarget(SharpDX.Direct2D1.RenderTarget renderTarget)
         {
             Direct2DFactory = PerspexLocator.Current.GetService<Factory>();
             DirectWriteFactory = PerspexLocator.Current.GetService<DwFactory>();

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(); }
             }

tests/Perspex.Controls.UnitTests/TestRoot.cs

@@ -15,7 +15,7 @@ namespace Perspex.Controls.UnitTests
 
         public ILayoutManager LayoutManager => new Mock<ILayoutManager>().Object;
 
-        public IRenderingViewport Viewport
+        public IRenderTarget RenderTarget
         {
             get { throw new NotImplementedException(); }
         }

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(); }
         }