Merge pull request #40 from ncarrillo/feat-cairo-rtb

Implemented RenderTargetBitmap support for Cairo

Cairo/Perspex.Cairo/CairoPlatform.cs

@@ -27,8 +27,7 @@ namespace Perspex.Cairo
 
         public IBitmapImpl CreateBitmap(int width, int height)
         {
-            throw new NotImplementedException();
-            ////return new BitmapImpl(imagingFactory, width, height);
+            return new BitmapImpl(new ImageSurface(Format.Argb32, width, height));
         }
 
         public IFormattedTextImpl CreateFormattedText(
@@ -49,7 +48,7 @@ namespace Perspex.Cairo
 
         public IRenderTargetBitmapImpl CreateRenderTargetBitmap(int width, int height)
         {
-            throw new NotImplementedException();
+            return new RenderTargetBitmapImpl(new ImageSurface(Format.Argb32, width, height));
         }
 
         public IStreamGeometryImpl CreateStreamGeometry()

Cairo/Perspex.Cairo/Media/DrawingContext.cs

@@ -70,7 +70,7 @@ namespace Perspex.Cairo.Media
         {
             this.context.Dispose();
 
-            if (this.surface != null)
+            if (this.surface is Cairo.Win32Surface)
             {
                 this.surface.Dispose();
             }

Cairo/Perspex.Cairo/Media/Imaging/BitmapImpl.cs

@@ -35,7 +35,7 @@ namespace Perspex.Cairo.Media.Imaging
 
         public void Save(string fileName)
         {
-            throw new NotImplementedException();
+            this.Surface.WriteToPng(fileName);
         }
     }
 }

Cairo/Perspex.Cairo/Media/Imaging/RenderTargetBitmapImpl.cs

@@ -0,0 +1,33 @@
+// -----------------------------------------------------------------------
+// <copyright file="RenderTargetBitmapImpl.cs" company="Steven Kirk">
+// Copyright 2014 MIT Licence. See licence.md for more information.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Perspex.Cairo.Media.Imaging
+{
+    using System;
+    using Perspex.Platform;
+    using Cairo = global::Cairo;
+
+    public class RenderTargetBitmapImpl : BitmapImpl, IRenderTargetBitmapImpl
+    {
+
+        public RenderTargetBitmapImpl(
+            Cairo.ImageSurface surface)
+            : base(surface)
+        {
+        }
+
+        public void Dispose()
+        {
+            this.Surface.Dispose();
+        }
+
+        public void Render(IVisual visual)
+        {
+            Renderer renderer = new Renderer(this.Surface);
+            renderer.Render(visual, new PlatformHandle(IntPtr.Zero, "RTB"));
+        }
+    }
+}

Cairo/Perspex.Cairo/Perspex.Cairo.csproj

@@ -70,6 +70,7 @@
     <Compile Include="Media\DrawingContext.cs" />
     <Compile Include="Media\FormattedTextImpl.cs" />
     <Compile Include="Media\Imaging\BitmapImpl.cs" />
+    <Compile Include="Media\Imaging\RenderTargetBitmapImpl.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Renderer.cs" />
     <Compile Include="CairoExtensions.cs" />

Cairo/Perspex.Cairo/Renderer.cs

@@ -30,6 +30,12 @@ namespace Perspex.Cairo
         {
         }
 
+        private ImageSurface surface;
+        public Renderer(ImageSurface surface)
+        {
+            this.surface = surface;
+        }
+
         /// <summary>
         /// Resizes the renderer.
         /// </summary>
@@ -51,6 +57,8 @@ namespace Perspex.Cairo
             {
                 case "HWND":
                     return new DrawingContext(new Win32Surface(GetDC(handle.Handle)));
+                case "RTB":
+                    return new DrawingContext(this.surface);
                 case "HDC":
                     return new DrawingContext(new Win32Surface(handle.Handle));
                 case "GdkWindow":

Perspex.SceneGraph/Media/Imaging/RenderTargetBitmap.cs

@@ -8,8 +8,9 @@ namespace Perspex.Media.Imaging
 {
     using Perspex.Platform;
     using Splat;
+    using System;
 
-    public class RenderTargetBitmap : Bitmap
+    public class RenderTargetBitmap : Bitmap, IDisposable
     {
         public RenderTargetBitmap(int width, int height)
             : base(CreateImpl(width, height))
@@ -31,5 +32,10 @@ namespace Perspex.Media.Imaging
             IPlatformRenderInterface factory = Locator.Current.GetService<IPlatformRenderInterface>();
             return factory.CreateRenderTargetBitmap(width, height);
         }
+
+        public void Dispose()
+        {
+            this.PlatformImpl.Dispose();
+        }
     }
 }

Perspex.SceneGraph/Platform/IRenderTargetBitmapImpl.cs

@@ -4,9 +4,11 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
+using System;
+
 namespace Perspex.Platform
 {
-    public interface IRenderTargetBitmapImpl : IBitmapImpl
+    public interface IRenderTargetBitmapImpl : IBitmapImpl, IDisposable
     {
         void Render(IVisual visual);
     }

Windows/Perspex.Direct2D1/Media/Imaging/RenderTargetBitmapImpl.cs

@@ -11,7 +11,7 @@ namespace Perspex.Direct2D1.Media
     using SharpDX.Direct2D1;
     using SharpDX.WIC;
 
-    public class RenderTargetBitmapImpl : BitmapImpl, IRenderTargetBitmapImpl
+    public class RenderTargetBitmapImpl : BitmapImpl, IRenderTargetBitmapImpl, IDisposable
     {
         private WicRenderTarget target;
 
@@ -32,6 +32,11 @@ namespace Perspex.Direct2D1.Media
                 });
         }
 
+        public void Dispose()
+        {
+            // TODO:
+        }
+
         public void Render(IVisual visual)
         {
             Renderer renderer = new Renderer(this.target);