From e7247a2c12f383d7cd6e26136a1d96fab9f3102f Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Tue, 29 Aug 2017 01:17:19 +0200 Subject: [PATCH 01/40] Added methods for creating D2D render layers. Craetes a compatible render target depending on the type of `IRenderTargetBitmapImpl`. --- .../Direct3DInteropSample/MainWindow.cs | 3 +- .../Avalonia.Direct2D1/Direct2D1Platform.cs | 4 +- .../ExternalRenderTarget.cs | 15 ++-- .../Avalonia.Direct2D1/ICreateLayer.cs | 10 +++ .../Media/DrawingContextImpl.cs | 13 ++-- .../Media/ImageBrushImpl.cs | 7 +- .../Media/Imaging/BitmapImpl.cs | 32 +++++++-- .../Media/Imaging/D2DBitmapImpl.cs | 47 +++++++------ .../Imaging/D2DRenderTargetBitmapImpl.cs | 68 +++++++++++++++++++ .../Media/Imaging/WicBitmapImpl.cs | 57 +++++----------- ...apImpl.cs => WicRenderTargetBitmapImpl.cs} | 6 +- .../Avalonia.Direct2D1/OptionalDispose.cs | 22 ++++++ .../Avalonia.Direct2D1/RenderTarget.cs | 22 ++---- .../SwapChainRenderTarget.cs | 40 ++++++----- 14 files changed, 225 insertions(+), 121 deletions(-) create mode 100644 src/Windows/Avalonia.Direct2D1/ICreateLayer.cs create mode 100644 src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DRenderTargetBitmapImpl.cs rename src/Windows/Avalonia.Direct2D1/Media/Imaging/{RenderTargetBitmapImpl.cs => WicRenderTargetBitmapImpl.cs} (89%) create mode 100644 src/Windows/Avalonia.Direct2D1/OptionalDispose.cs diff --git a/samples/interop/Direct3DInteropSample/MainWindow.cs b/samples/interop/Direct3DInteropSample/MainWindow.cs index ad40e81895..3fe3b896f6 100644 --- a/samples/interop/Direct3DInteropSample/MainWindow.cs +++ b/samples/interop/Direct3DInteropSample/MainWindow.cs @@ -254,7 +254,8 @@ namespace Direct3DInteropSample public IDrawingContextImpl CreateDrawingContext(IVisualBrushRenderer visualBrushRenderer) { return new DrawingContextImpl(visualBrushRenderer, _window._d2dRenderTarget, - AvaloniaLocator.Current.GetService()); + AvaloniaLocator.Current.GetService(), + AvaloniaLocator.Current.GetService()); } } diff --git a/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs b/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs index fd8364c03b..eedb8a0c4e 100644 --- a/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs +++ b/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs @@ -145,7 +145,7 @@ namespace Avalonia.Direct2D1 return new HwndRenderTarget(nativeWindow); } if (s is IExternalDirect2DRenderTargetSurface external) - return new ExternalRenderTarget(external, s_dwfactory); + return new ExternalRenderTarget(external, s_dwfactory, s_imagingFactory); } throw new NotSupportedException("Don't know how to create a Direct2D1 renderer from any of provided surfaces"); } @@ -156,7 +156,7 @@ namespace Avalonia.Direct2D1 double dpiX, double dpiY) { - return new RenderTargetBitmapImpl( + return new WicRenderTargetBitmapImpl( s_imagingFactory, s_d2D1Factory, s_dwfactory, diff --git a/src/Windows/Avalonia.Direct2D1/ExternalRenderTarget.cs b/src/Windows/Avalonia.Direct2D1/ExternalRenderTarget.cs index 307048f7b4..d735c5f8bb 100644 --- a/src/Windows/Avalonia.Direct2D1/ExternalRenderTarget.cs +++ b/src/Windows/Avalonia.Direct2D1/ExternalRenderTarget.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using Avalonia.Direct2D1.Media; using Avalonia.Platform; using Avalonia.Rendering; @@ -15,11 +11,16 @@ namespace Avalonia.Direct2D1 { private readonly IExternalDirect2DRenderTargetSurface _externalRenderTargetProvider; private readonly DirectWriteFactory _dwFactory; - public ExternalRenderTarget(IExternalDirect2DRenderTargetSurface externalRenderTargetProvider, - DirectWriteFactory dwFactory) + private readonly SharpDX.WIC.ImagingFactory _wicFactory; + + public ExternalRenderTarget( + IExternalDirect2DRenderTargetSurface externalRenderTargetProvider, + DirectWriteFactory dwFactory, + SharpDX.WIC.ImagingFactory wicFactory) { _externalRenderTargetProvider = externalRenderTargetProvider; _dwFactory = dwFactory; + _wicFactory = wicFactory; } public void Dispose() @@ -31,7 +32,7 @@ namespace Avalonia.Direct2D1 { var target = _externalRenderTargetProvider.GetOrCreateRenderTarget(); _externalRenderTargetProvider.BeforeDrawing(); - return new DrawingContextImpl(visualBrushRenderer, target, _dwFactory, null, () => + return new DrawingContextImpl(visualBrushRenderer, target, _dwFactory, _wicFactory, null, () => { try { diff --git a/src/Windows/Avalonia.Direct2D1/ICreateLayer.cs b/src/Windows/Avalonia.Direct2D1/ICreateLayer.cs new file mode 100644 index 0000000000..9214377e6f --- /dev/null +++ b/src/Windows/Avalonia.Direct2D1/ICreateLayer.cs @@ -0,0 +1,10 @@ +using System; +using Avalonia.Platform; + +namespace Avalonia.Direct2D1 +{ + internal interface ICreateLayer + { + IRenderTargetBitmapImpl CreateLayer(int pixelWidth, int pixelHeight); + } +} diff --git a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs index 69b582b009..a7bb73e19f 100644 --- a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs +++ b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs @@ -2,16 +2,13 @@ // Licensed under the MIT license. See licence.md file in the project root for full license information. using System; -using System.Collections; using System.Collections.Generic; using Avalonia.Media; using Avalonia.Platform; -using Avalonia.RenderHelpers; using Avalonia.Rendering; using SharpDX; using SharpDX.Direct2D1; using SharpDX.Mathematics.Interop; -using IBitmap = Avalonia.Media.Imaging.IBitmap; namespace Avalonia.Direct2D1.Media { @@ -24,6 +21,7 @@ namespace Avalonia.Direct2D1.Media private readonly SharpDX.Direct2D1.RenderTarget _renderTarget; private readonly SharpDX.DXGI.SwapChain1 _swapChain; private readonly Action _finishedCallback; + private readonly SharpDX.WIC.ImagingFactory _imagingFactory; private SharpDX.DirectWrite.Factory _directWriteFactory; /// @@ -32,12 +30,14 @@ namespace Avalonia.Direct2D1.Media /// The visual brush renderer. /// The render target to draw to. /// The DirectWrite factory. + /// The WIC imaging factory. /// An optional swap chain associated with this drawing context. /// An optional delegate to be called when context is disposed. public DrawingContextImpl( IVisualBrushRenderer visualBrushRenderer, SharpDX.Direct2D1.RenderTarget renderTarget, SharpDX.DirectWrite.Factory directWriteFactory, + SharpDX.WIC.ImagingFactory imagingFactory, SharpDX.DXGI.SwapChain1 swapChain = null, Action finishedCallback = null) { @@ -46,6 +46,7 @@ namespace Avalonia.Direct2D1.Media _swapChain = swapChain; _finishedCallback = finishedCallback; _directWriteFactory = directWriteFactory; + _imagingFactory = imagingFactory; _swapChain = swapChain; _renderTarget.BeginDraw(); } @@ -97,7 +98,7 @@ namespace Avalonia.Direct2D1.Media using (var d2d = ((BitmapImpl)source).GetDirect2DBitmap(_renderTarget)) { _renderTarget.DrawBitmap( - d2d, + d2d.Value, destRect.ToSharpDX(), (float)opacity, BitmapInterpolationMode.Linear, @@ -115,7 +116,7 @@ namespace Avalonia.Direct2D1.Media public void DrawImage(IBitmapImpl source, IBrush opacityMask, Rect opacityMaskRect, Rect destRect) { using (var d2dSource = ((BitmapImpl)source).GetDirect2DBitmap(_renderTarget)) - using (var sourceBrush = new BitmapBrush(_renderTarget, d2dSource)) + using (var sourceBrush = new BitmapBrush(_renderTarget, d2dSource.Value)) using (var d2dOpacityMask = CreateBrush(opacityMask, opacityMaskRect.Size)) using (var geometry = new SharpDX.Direct2D1.RectangleGeometry(_renderTarget.Factory, destRect.ToDirect2D())) { @@ -397,7 +398,7 @@ namespace Avalonia.Direct2D1.Media return new ImageBrushImpl( visualBrush, _renderTarget, - new D2DBitmapImpl(intermediate.Bitmap), + new D2DBitmapImpl(_imagingFactory, intermediate.Bitmap), destinationSize); } } diff --git a/src/Windows/Avalonia.Direct2D1/Media/ImageBrushImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/ImageBrushImpl.cs index ed3d78b4fd..08cfed2ace 100644 --- a/src/Windows/Avalonia.Direct2D1/Media/ImageBrushImpl.cs +++ b/src/Windows/Avalonia.Direct2D1/Media/ImageBrushImpl.cs @@ -10,6 +10,8 @@ namespace Avalonia.Direct2D1.Media { public sealed class ImageBrushImpl : BrushImpl { + OptionalDispose _bitmap; + public ImageBrushImpl( ITileBrush brush, SharpDX.Direct2D1.RenderTarget target, @@ -20,9 +22,10 @@ namespace Avalonia.Direct2D1.Media if (!calc.NeedsIntermediate) { + _bitmap = bitmap.GetDirect2DBitmap(target); PlatformBrush = new BitmapBrush( target, - bitmap.GetDirect2DBitmap(target), + _bitmap.Value, GetBitmapBrushProperties(brush), GetBrushProperties(brush, calc.DestinationRect)); } @@ -41,7 +44,7 @@ namespace Avalonia.Direct2D1.Media public override void Dispose() { - ((BitmapBrush)PlatformBrush)?.Bitmap.Dispose(); + _bitmap.Dispose(); base.Dispose(); } diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/BitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/BitmapImpl.cs index 63596bdf54..d58f023391 100644 --- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/BitmapImpl.cs +++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/BitmapImpl.cs @@ -1,20 +1,38 @@ using System; -using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using Avalonia.Platform; -using SharpDX.Direct2D1; +using SharpDX.WIC; +using D2DBitmap = SharpDX.Direct2D1.Bitmap; namespace Avalonia.Direct2D1.Media { public abstract class BitmapImpl : IBitmapImpl, IDisposable { - public abstract Bitmap GetDirect2DBitmap(SharpDX.Direct2D1.RenderTarget target); + public BitmapImpl(ImagingFactory imagingFactory) + { + WicImagingFactory = imagingFactory; + } + + public ImagingFactory WicImagingFactory { get; } public abstract int PixelWidth { get; } public abstract int PixelHeight { get; } - public abstract void Save(string fileName); + + public abstract OptionalDispose GetDirect2DBitmap(SharpDX.Direct2D1.RenderTarget target); + + public void Save(string fileName) + { + if (Path.GetExtension(fileName) != ".png") + { + // Yeah, we need to support other formats. + throw new NotSupportedException("Use PNG, stoopid."); + } + + using (FileStream s = new FileStream(fileName, FileMode.Create)) + { + Save(s); + } + } + public abstract void Save(Stream stream); public virtual void Dispose() diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DBitmapImpl.cs index 5378ae3257..b03e022674 100644 --- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DBitmapImpl.cs +++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DBitmapImpl.cs @@ -1,11 +1,10 @@ using System; -using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Avalonia.Platform; using SharpDX.Direct2D1; +using WICFactory = SharpDX.WIC.ImagingFactory; +using ImagingFactory2 = SharpDX.WIC.ImagingFactory2; +using ImageParameters = SharpDX.WIC.ImageParameters; +using PngBitmapEncoder = SharpDX.WIC.PngBitmapEncoder; namespace Avalonia.Direct2D1.Media { @@ -26,32 +25,42 @@ namespace Avalonia.Direct2D1.Media /// or if the render target is a , /// the device associated with this context, to be renderable. /// - public D2DBitmapImpl(Bitmap d2DBitmap) + public D2DBitmapImpl(WICFactory imagingFactory, Bitmap d2DBitmap) + : base(imagingFactory) { - if (d2DBitmap == null) throw new ArgumentNullException(nameof(d2DBitmap)); - - _direct2D = d2DBitmap; + _direct2D = d2DBitmap ?? throw new ArgumentNullException(nameof(d2DBitmap)); } - - public override Bitmap GetDirect2DBitmap(SharpDX.Direct2D1.RenderTarget target) => _direct2D; - + public override int PixelWidth => _direct2D.PixelSize.Width; public override int PixelHeight => _direct2D.PixelSize.Height; - public override void Save(string fileName) + public override void Dispose() { - throw new NotImplementedException(); + base.Dispose(); + _direct2D.Dispose(); } - public override void Save(Stream stream) + public override OptionalDispose GetDirect2DBitmap(SharpDX.Direct2D1.RenderTarget target) { - throw new NotImplementedException(); + return new OptionalDispose(_direct2D, false); } - public override void Dispose() + public override void Save(Stream stream) { - base.Dispose(); - _direct2D.Dispose(); + using (var encoder = new PngBitmapEncoder(WicImagingFactory, stream)) + using (var frameEncode = new SharpDX.WIC.BitmapFrameEncode(encoder)) + using (var imageEncoder = new SharpDX.WIC.ImageEncoder((ImagingFactory2)WicImagingFactory, null)) + { + var parameters = new ImageParameters( + new PixelFormat(SharpDX.DXGI.Format.R8G8B8A8_UNorm, AlphaMode.Premultiplied), + _direct2D.DotsPerInch.Width, + _direct2D.DotsPerInch.Height, + 0, 0, PixelWidth, PixelHeight); + + imageEncoder.WriteFrame(_direct2D, frameEncode, parameters); + frameEncode.Commit(); + encoder.Commit(); + } } } } diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DRenderTargetBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DRenderTargetBitmapImpl.cs new file mode 100644 index 0000000000..6162d57bad --- /dev/null +++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DRenderTargetBitmapImpl.cs @@ -0,0 +1,68 @@ +using System; +using Avalonia.Platform; +using Avalonia.Rendering; +using SharpDX; +using SharpDX.Direct2D1; +using SharpDX.WIC; +using D2DBitmap = SharpDX.Direct2D1.Bitmap; +using DirectWriteFactory = SharpDX.DirectWrite.Factory; + +namespace Avalonia.Direct2D1.Media.Imaging +{ + public class D2DRenderTargetBitmapImpl : D2DBitmapImpl, IRenderTargetBitmapImpl, ICreateLayer + { + private readonly DirectWriteFactory _dwriteFactory; + private readonly BitmapRenderTarget _target; + + public D2DRenderTargetBitmapImpl( + ImagingFactory imagingFactory, + DirectWriteFactory dwriteFactory, + BitmapRenderTarget target) + : base(imagingFactory, target.Bitmap) + { + _dwriteFactory = dwriteFactory; + _target = target; + } + + public override int PixelWidth => _target.PixelSize.Width; + public override int PixelHeight => _target.PixelSize.Height; + + public static D2DRenderTargetBitmapImpl CreateCompatible( + ImagingFactory imagingFactory, + DirectWriteFactory dwriteFactory, + SharpDX.Direct2D1.RenderTarget renderTarget, + int pixelWidth, + int pixelHeight) + { + var bitmapRenderTarget = new BitmapRenderTarget( + renderTarget, + CompatibleRenderTargetOptions.None, + new Size2F(pixelWidth, pixelHeight)); + return new D2DRenderTargetBitmapImpl(imagingFactory, dwriteFactory, bitmapRenderTarget); + } + + public IDrawingContextImpl CreateDrawingContext(IVisualBrushRenderer visualBrushRenderer) + { + return new DrawingContextImpl( + visualBrushRenderer, + _target, + _dwriteFactory, + WicImagingFactory); + } + + public IRenderTargetBitmapImpl CreateLayer(int pixelWidth, int pixelHeight) + { + return CreateCompatible(WicImagingFactory, _dwriteFactory, _target, pixelWidth, pixelHeight); + } + + public override void Dispose() + { + _target.Dispose(); + } + + public override OptionalDispose GetDirect2DBitmap(SharpDX.Direct2D1.RenderTarget target) + { + return new OptionalDispose(_target.Bitmap, false); + } + } +} diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs index e817dd4812..9b99b4c40a 100644 --- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs +++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs @@ -3,11 +3,10 @@ using System; using System.IO; -using Avalonia.Platform; using Avalonia.Win32.Interop; -using PixelFormat = SharpDX.WIC.PixelFormat; -using APixelFormat = Avalonia.Platform.PixelFormat; using SharpDX.WIC; +using APixelFormat = Avalonia.Platform.PixelFormat; +using D2DBitmap = SharpDX.Direct2D1.Bitmap; namespace Avalonia.Direct2D1.Media { @@ -16,18 +15,14 @@ namespace Avalonia.Direct2D1.Media /// public class WicBitmapImpl : BitmapImpl { - private readonly ImagingFactory _factory; - - /// /// Initializes a new instance of the class. /// /// The WIC imaging factory to use. /// The filename of the bitmap to load. public WicBitmapImpl(ImagingFactory factory, string fileName) + : base(factory) { - _factory = factory; - using (BitmapDecoder decoder = new BitmapDecoder(factory, fileName, DecodeOptions.CacheOnDemand)) { WicImpl = new Bitmap(factory, decoder.GetFrame(0), BitmapCreateCacheOption.CacheOnDemand); @@ -40,9 +35,8 @@ namespace Avalonia.Direct2D1.Media /// The WIC imaging factory to use. /// The stream to read the bitmap from. public WicBitmapImpl(ImagingFactory factory, Stream stream) + : base(factory) { - _factory = factory; - using (BitmapDecoder decoder = new BitmapDecoder(factory, stream, DecodeOptions.CacheOnLoad)) { WicImpl = new Bitmap(factory, decoder.GetFrame(0), BitmapCreateCacheOption.CacheOnLoad); @@ -57,11 +51,11 @@ namespace Avalonia.Direct2D1.Media /// The height of the bitmap. /// Pixel format public WicBitmapImpl(ImagingFactory factory, int width, int height, APixelFormat? pixelFormat = null) + : base(factory) { if (!pixelFormat.HasValue) pixelFormat = APixelFormat.Bgra8888; - _factory = factory; PixelFormat = pixelFormat; WicImpl = new Bitmap( factory, @@ -71,7 +65,8 @@ namespace Avalonia.Direct2D1.Media BitmapCreateCacheOption.CacheOnLoad); } - public WicBitmapImpl(ImagingFactory factory, Platform.PixelFormat format, IntPtr data, int width, int height, int stride) + public WicBitmapImpl(ImagingFactory factory, APixelFormat format, IntPtr data, int width, int height, int stride) + : base(factory) { WicImpl = new Bitmap(factory, width, height, format.ToWic(), BitmapCreateCacheOption.CacheOnDemand); PixelFormat = format; @@ -112,41 +107,23 @@ namespace Avalonia.Direct2D1.Media /// /// The render target. /// The Direct2D bitmap. - public override SharpDX.Direct2D1.Bitmap GetDirect2DBitmap(SharpDX.Direct2D1.RenderTarget renderTarget) + public override OptionalDispose GetDirect2DBitmap(SharpDX.Direct2D1.RenderTarget renderTarget) { - FormatConverter converter = new FormatConverter(_factory); + FormatConverter converter = new FormatConverter(WicImagingFactory); converter.Initialize(WicImpl, SharpDX.WIC.PixelFormat.Format32bppPBGRA); - return SharpDX.Direct2D1.Bitmap.FromWicBitmap(renderTarget, converter); + return new OptionalDispose(D2DBitmap.FromWicBitmap(renderTarget, converter), true); } - /// - /// Saves the bitmap to a file. - /// - /// The filename. - public override void Save(string fileName) + public override void Save(Stream stream) { - if (Path.GetExtension(fileName) != ".png") - { - // Yeah, we need to support other formats. - throw new NotSupportedException("Use PNG, stoopid."); - } - - using (FileStream s = new FileStream(fileName, FileMode.Create)) + using (var encoder = new PngBitmapEncoder(WicImagingFactory, stream)) + using (var frame = new BitmapFrameEncode(encoder)) { - Save(s); + frame.Initialize(); + frame.WriteSource(WicImpl); + frame.Commit(); + encoder.Commit(); } } - - public override void Save(Stream stream) - { - PngBitmapEncoder encoder = new PngBitmapEncoder(_factory); - encoder.Initialize(stream); - - BitmapFrameEncode frame = new BitmapFrameEncode(encoder); - frame.Initialize(); - frame.WriteSource(WicImpl); - frame.Commit(); - encoder.Commit(); - } } } diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/RenderTargetBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicRenderTargetBitmapImpl.cs similarity index 89% rename from src/Windows/Avalonia.Direct2D1/Media/Imaging/RenderTargetBitmapImpl.cs rename to src/Windows/Avalonia.Direct2D1/Media/Imaging/WicRenderTargetBitmapImpl.cs index 33736b02cb..1540ee333a 100644 --- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/RenderTargetBitmapImpl.cs +++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicRenderTargetBitmapImpl.cs @@ -10,12 +10,12 @@ using DirectWriteFactory = SharpDX.DirectWrite.Factory; namespace Avalonia.Direct2D1.Media { - public class RenderTargetBitmapImpl : WicBitmapImpl, IRenderTargetBitmapImpl + public class WicRenderTargetBitmapImpl : WicBitmapImpl, IRenderTargetBitmapImpl { private readonly DirectWriteFactory _dwriteFactory; private readonly WicRenderTarget _target; - public RenderTargetBitmapImpl( + public WicRenderTargetBitmapImpl( ImagingFactory imagingFactory, Factory d2dFactory, DirectWriteFactory dwriteFactory, @@ -47,7 +47,7 @@ namespace Avalonia.Direct2D1.Media public IDrawingContextImpl CreateDrawingContext(IVisualBrushRenderer visualBrushRenderer) { - return new DrawingContextImpl(visualBrushRenderer, _target, _dwriteFactory); + return new DrawingContextImpl(visualBrushRenderer, _target, _dwriteFactory, WicImagingFactory); } } } diff --git a/src/Windows/Avalonia.Direct2D1/OptionalDispose.cs b/src/Windows/Avalonia.Direct2D1/OptionalDispose.cs new file mode 100644 index 0000000000..cd3eee8d25 --- /dev/null +++ b/src/Windows/Avalonia.Direct2D1/OptionalDispose.cs @@ -0,0 +1,22 @@ +using System; + +namespace Avalonia.Direct2D1 +{ + public struct OptionalDispose : IDisposable where T : IDisposable + { + private readonly bool _dispose; + + public OptionalDispose(T value, bool dispose) + { + Value = value; + _dispose = dispose; + } + + public T Value { get; } + + public void Dispose() + { + if (_dispose) Value?.Dispose(); + } + } +} diff --git a/src/Windows/Avalonia.Direct2D1/RenderTarget.cs b/src/Windows/Avalonia.Direct2D1/RenderTarget.cs index b4c9b49e3f..cbeff8b2f1 100644 --- a/src/Windows/Avalonia.Direct2D1/RenderTarget.cs +++ b/src/Windows/Avalonia.Direct2D1/RenderTarget.cs @@ -7,6 +7,7 @@ using Avalonia.Platform; using Avalonia.Rendering; using SharpDX.Direct2D1; using DwFactory = SharpDX.DirectWrite.Factory; +using WicFactory = SharpDX.WIC.ImagingFactory; namespace Avalonia.Direct2D1 { @@ -25,24 +26,13 @@ namespace Avalonia.Direct2D1 { Direct2DFactory = AvaloniaLocator.Current.GetService(); DirectWriteFactory = AvaloniaLocator.Current.GetService(); + WicFactory = AvaloniaLocator.Current.GetService(); _renderTarget = renderTarget; } - /// - /// Gets the Direct2D factory. - /// - public Factory Direct2DFactory - { - get; - } - - /// - /// Gets the DirectWrite factory. - /// - public DwFactory DirectWriteFactory - { - get; - } + public Factory Direct2DFactory { get; } + public DwFactory DirectWriteFactory { get; } + public WicFactory WicFactory { get; } /// /// Creates a drawing context for a rendering session. @@ -50,7 +40,7 @@ namespace Avalonia.Direct2D1 /// An . public IDrawingContextImpl CreateDrawingContext(IVisualBrushRenderer visualBrushRenderer) { - return new DrawingContextImpl(visualBrushRenderer, _renderTarget, DirectWriteFactory); + return new DrawingContextImpl(visualBrushRenderer, _renderTarget, DirectWriteFactory, WicFactory); } public void Dispose() diff --git a/src/Windows/Avalonia.Direct2D1/SwapChainRenderTarget.cs b/src/Windows/Avalonia.Direct2D1/SwapChainRenderTarget.cs index 3c1024e73a..bd6555159c 100644 --- a/src/Windows/Avalonia.Direct2D1/SwapChainRenderTarget.cs +++ b/src/Windows/Avalonia.Direct2D1/SwapChainRenderTarget.cs @@ -10,10 +10,11 @@ using Factory = SharpDX.Direct2D1.Factory; using Factory2 = SharpDX.DXGI.Factory2; using Avalonia.Rendering; using Avalonia.Direct2D1.Media; +using Avalonia.Direct2D1.Media.Imaging; namespace Avalonia.Direct2D1 { - public abstract class SwapChainRenderTarget : IRenderTarget + public abstract class SwapChainRenderTarget : IRenderTarget, ICreateLayer { private Size2 _savedSize; private Size2F _savedDpi; @@ -26,24 +27,12 @@ namespace Avalonia.Direct2D1 D2DDevice = AvaloniaLocator.Current.GetService(); Direct2DFactory = AvaloniaLocator.Current.GetService(); DirectWriteFactory = AvaloniaLocator.Current.GetService(); + WicImagingFactory = AvaloniaLocator.Current.GetService(); } - - /// - /// Gets the Direct2D factory. - /// - public Factory Direct2DFactory - { - get; - } - - /// - /// Gets the DirectWrite factory. - /// - public SharpDX.DirectWrite.Factory DirectWriteFactory - { - get; - } + public Factory Direct2DFactory { get; } + public SharpDX.DirectWrite.Factory DirectWriteFactory { get; } + public SharpDX.WIC.ImagingFactory WicImagingFactory { get; } protected SharpDX.DXGI.Device DxgiDevice { get; } @@ -69,9 +58,25 @@ namespace Avalonia.Direct2D1 visualBrushRenderer, _deviceContext, DirectWriteFactory, + WicImagingFactory, _swapChain); } + public IRenderTargetBitmapImpl CreateLayer(int pixelWidth, int pixelHeight) + { + if (_deviceContext == null) + { + CreateSwapChain(); + } + + return D2DRenderTargetBitmapImpl.CreateCompatible( + WicImagingFactory, + DirectWriteFactory, + _deviceContext, + pixelWidth, + pixelHeight); + } + public void Dispose() { _deviceContext?.Dispose(); @@ -86,7 +91,6 @@ namespace Avalonia.Direct2D1 _deviceContext?.Dispose(); _deviceContext = new DeviceContext(D2DDevice, DeviceContextOptions.None) {DotsPerInch = _savedDpi}; - var swapChainDesc = new SwapChainDescription1 { Width = _savedSize.Width, From 8efd5e56a25ea3cf2a65e2d7f79a6697b9e13bd7 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Tue, 29 Aug 2017 01:17:35 +0200 Subject: [PATCH 02/40] Added missing doc comments. --- .../Platform/IDrawingContextImpl.cs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs b/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs index 14aef8463a..1bae88cb5f 100644 --- a/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs +++ b/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs @@ -86,6 +86,9 @@ namespace Avalonia.Platform /// The clip rectangle. void PushClip(Rect clip); + /// + /// Pops the latest pushed clip rectangle. + /// void PopClip(); /// @@ -94,10 +97,19 @@ namespace Avalonia.Platform /// The opacity. void PushOpacity(double opacity); + /// + /// Pops the latest pushed opacity value. + /// void PopOpacity(); + /// + /// Pushes an opacity mask + /// void PushOpacityMask(IBrush mask, Rect bounds); + /// + /// Pops the latest pushed opacity mask. + /// void PopOpacityMask(); /// @@ -106,6 +118,9 @@ namespace Avalonia.Platform /// The clip geometry. void PushGeometryClip(IGeometryImpl clip); + /// + /// Pops the latest pushed geometry clip. + /// void PopGeometryClip(); } } From 5607404e6cb6a3e9c7d5e6e823668d42a807b3b2 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Tue, 29 Aug 2017 13:14:19 +0200 Subject: [PATCH 03/40] Added IDrawingContextImpl.CreateLayer --- .../Direct3DInteropSample/MainWindow.cs | 2 +- .../Platform/IDrawingContextImpl.cs | 14 ++++++++++ .../SceneGraph/DeferredDrawingContextImpl.cs | 5 ++++ .../Avalonia.Cairo/Media/DrawingContext.cs | 6 +++++ src/Skia/Avalonia.Skia/DrawingContextImpl.cs | 6 +++++ .../ExternalRenderTarget.cs | 15 +++++++++-- .../Avalonia.Direct2D1/ICreateLayer.cs | 10 ------- .../Avalonia.Direct2D1/ILayerFactory.cs | 10 +++++++ .../Media/DrawingContextImpl.cs | 26 +++++++++++++++++++ .../Imaging/D2DRenderTargetBitmapImpl.cs | 12 ++++----- .../Imaging/WicRenderTargetBitmapImpl.cs | 7 ++++- .../Avalonia.Direct2D1/RenderTarget.cs | 14 ++++++++-- .../SwapChainRenderTarget.cs | 8 +++--- 13 files changed, 109 insertions(+), 26 deletions(-) delete mode 100644 src/Windows/Avalonia.Direct2D1/ICreateLayer.cs create mode 100644 src/Windows/Avalonia.Direct2D1/ILayerFactory.cs diff --git a/samples/interop/Direct3DInteropSample/MainWindow.cs b/samples/interop/Direct3DInteropSample/MainWindow.cs index 3fe3b896f6..ffa0de0a36 100644 --- a/samples/interop/Direct3DInteropSample/MainWindow.cs +++ b/samples/interop/Direct3DInteropSample/MainWindow.cs @@ -253,7 +253,7 @@ namespace Direct3DInteropSample public IDrawingContextImpl CreateDrawingContext(IVisualBrushRenderer visualBrushRenderer) { - return new DrawingContextImpl(visualBrushRenderer, _window._d2dRenderTarget, + return new DrawingContextImpl(visualBrushRenderer, null, _window._d2dRenderTarget, AvaloniaLocator.Current.GetService(), AvaloniaLocator.Current.GetService()); } diff --git a/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs b/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs index 1bae88cb5f..3db4527bfb 100644 --- a/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs +++ b/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs @@ -80,6 +80,20 @@ namespace Avalonia.Platform /// The corner radius. void FillRectangle(IBrush brush, Rect rect, float cornerRadius = 0.0f); + /// + /// Creates a new that can be used as a render layer + /// for the current render target. + /// + /// The size of the layer in DIPs. + /// An + /// + /// Depending on the rendering backend used, a layer created via this method may be more + /// performant than a standard render target bitmap. In particular the Direct2D backend + /// has to do a format conversion each time a standard render target bitmap is rendered, + /// but a layer created via this method has no such overhead. + /// + IRenderTargetBitmapImpl CreateLayer(Size size); + /// /// Pushes a clip rectange. /// diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs index 0b01960d5b..5fcd0e42bd 100644 --- a/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs +++ b/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs @@ -194,6 +194,11 @@ namespace Avalonia.Rendering.SceneGraph } } + public IRenderTargetBitmapImpl CreateLayer(Size size) + { + throw new NotImplementedException(); + } + /// public void PopClip() { diff --git a/src/Gtk/Avalonia.Cairo/Media/DrawingContext.cs b/src/Gtk/Avalonia.Cairo/Media/DrawingContext.cs index 99b0a2ec73..7900f2e440 100644 --- a/src/Gtk/Avalonia.Cairo/Media/DrawingContext.cs +++ b/src/Gtk/Avalonia.Cairo/Media/DrawingContext.cs @@ -227,6 +227,12 @@ namespace Avalonia.Cairo.Media } } + public IRenderTargetBitmapImpl CreateLayer(Size size) + { + var surface = new Cairo.ImageSurface(Cairo.Format.Argb32, (int)size.Width, (int)size.Height); + return new RenderTargetBitmapImpl(surface); + } + /// /// Pushes a clip rectange. /// diff --git a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs index 7a83835b10..f01e9858e7 100644 --- a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs +++ b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs @@ -349,6 +349,12 @@ namespace Avalonia.Skia } } + public IRenderTargetBitmapImpl CreateLayer(Size size) + { + var pixelSize = size * (_dpi / 96); + return new BitmapImpl((int)pixelSize.Width, (int)pixelSize.Height, _dpi); + } + public void PushClip(Rect clip) { Canvas.Save(); diff --git a/src/Windows/Avalonia.Direct2D1/ExternalRenderTarget.cs b/src/Windows/Avalonia.Direct2D1/ExternalRenderTarget.cs index d735c5f8bb..176cedd377 100644 --- a/src/Windows/Avalonia.Direct2D1/ExternalRenderTarget.cs +++ b/src/Windows/Avalonia.Direct2D1/ExternalRenderTarget.cs @@ -1,5 +1,6 @@ using System; using Avalonia.Direct2D1.Media; +using Avalonia.Direct2D1.Media.Imaging; using Avalonia.Platform; using Avalonia.Rendering; using SharpDX; @@ -7,7 +8,7 @@ using DirectWriteFactory = SharpDX.DirectWrite.Factory; namespace Avalonia.Direct2D1 { - class ExternalRenderTarget : IRenderTarget + class ExternalRenderTarget : IRenderTarget, ILayerFactory { private readonly IExternalDirect2DRenderTargetSurface _externalRenderTargetProvider; private readonly DirectWriteFactory _dwFactory; @@ -32,7 +33,7 @@ namespace Avalonia.Direct2D1 { var target = _externalRenderTargetProvider.GetOrCreateRenderTarget(); _externalRenderTargetProvider.BeforeDrawing(); - return new DrawingContextImpl(visualBrushRenderer, target, _dwFactory, _wicFactory, null, () => + return new DrawingContextImpl(visualBrushRenderer, null, target, _dwFactory, _wicFactory, null, () => { try { @@ -44,5 +45,15 @@ namespace Avalonia.Direct2D1 } }); } + + public IRenderTargetBitmapImpl CreateLayer(Size size) + { + var target = _externalRenderTargetProvider.GetOrCreateRenderTarget(); + return D2DRenderTargetBitmapImpl.CreateCompatible( + _wicFactory, + _dwFactory, + target, + size); + } } } diff --git a/src/Windows/Avalonia.Direct2D1/ICreateLayer.cs b/src/Windows/Avalonia.Direct2D1/ICreateLayer.cs deleted file mode 100644 index 9214377e6f..0000000000 --- a/src/Windows/Avalonia.Direct2D1/ICreateLayer.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; -using Avalonia.Platform; - -namespace Avalonia.Direct2D1 -{ - internal interface ICreateLayer - { - IRenderTargetBitmapImpl CreateLayer(int pixelWidth, int pixelHeight); - } -} diff --git a/src/Windows/Avalonia.Direct2D1/ILayerFactory.cs b/src/Windows/Avalonia.Direct2D1/ILayerFactory.cs new file mode 100644 index 0000000000..99f8d4f7ac --- /dev/null +++ b/src/Windows/Avalonia.Direct2D1/ILayerFactory.cs @@ -0,0 +1,10 @@ +using System; +using Avalonia.Platform; + +namespace Avalonia.Direct2D1 +{ + public interface ILayerFactory + { + IRenderTargetBitmapImpl CreateLayer(Size size); + } +} diff --git a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs index a7bb73e19f..6a72923ce3 100644 --- a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs +++ b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs @@ -18,6 +18,7 @@ namespace Avalonia.Direct2D1.Media public class DrawingContextImpl : IDrawingContextImpl, IDisposable { private readonly IVisualBrushRenderer _visualBrushRenderer; + private readonly ILayerFactory _layerFactory; private readonly SharpDX.Direct2D1.RenderTarget _renderTarget; private readonly SharpDX.DXGI.SwapChain1 _swapChain; private readonly Action _finishedCallback; @@ -29,12 +30,17 @@ namespace Avalonia.Direct2D1.Media /// /// The visual brush renderer. /// The render target to draw to. + /// + /// An object to use to create layers. May be null, in which case a + /// will created when a new layer is requested. + /// /// The DirectWrite factory. /// The WIC imaging factory. /// An optional swap chain associated with this drawing context. /// An optional delegate to be called when context is disposed. public DrawingContextImpl( IVisualBrushRenderer visualBrushRenderer, + ILayerFactory layerFactory, SharpDX.Direct2D1.RenderTarget renderTarget, SharpDX.DirectWrite.Factory directWriteFactory, SharpDX.WIC.ImagingFactory imagingFactory, @@ -42,6 +48,7 @@ namespace Avalonia.Direct2D1.Media Action finishedCallback = null) { _visualBrushRenderer = visualBrushRenderer; + _layerFactory = layerFactory; _renderTarget = renderTarget; _swapChain = swapChain; _finishedCallback = finishedCallback; @@ -285,6 +292,25 @@ namespace Avalonia.Direct2D1.Media } } + public IRenderTargetBitmapImpl CreateLayer(Size size) + { + if (_layerFactory != null) + { + return _layerFactory.CreateLayer(size); + } + else + { + var platform = AvaloniaLocator.Current.GetService(); + var dpi = new Vector(_renderTarget.DotsPerInch.Width, _renderTarget.DotsPerInch.Height); + var pixelSize = size * (dpi / 96); + return platform.CreateRenderTargetBitmap( + (int)pixelSize.Width, + (int)pixelSize.Height, + dpi.X, + dpi.Y); + } + } + /// /// Pushes a clip rectange. /// diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DRenderTargetBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DRenderTargetBitmapImpl.cs index 6162d57bad..2843848fac 100644 --- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DRenderTargetBitmapImpl.cs +++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DRenderTargetBitmapImpl.cs @@ -9,7 +9,7 @@ using DirectWriteFactory = SharpDX.DirectWrite.Factory; namespace Avalonia.Direct2D1.Media.Imaging { - public class D2DRenderTargetBitmapImpl : D2DBitmapImpl, IRenderTargetBitmapImpl, ICreateLayer + public class D2DRenderTargetBitmapImpl : D2DBitmapImpl, IRenderTargetBitmapImpl, ILayerFactory { private readonly DirectWriteFactory _dwriteFactory; private readonly BitmapRenderTarget _target; @@ -31,13 +31,12 @@ namespace Avalonia.Direct2D1.Media.Imaging ImagingFactory imagingFactory, DirectWriteFactory dwriteFactory, SharpDX.Direct2D1.RenderTarget renderTarget, - int pixelWidth, - int pixelHeight) + Size size) { var bitmapRenderTarget = new BitmapRenderTarget( renderTarget, CompatibleRenderTargetOptions.None, - new Size2F(pixelWidth, pixelHeight)); + new Size2F((float)size.Width, (float)size.Height)); return new D2DRenderTargetBitmapImpl(imagingFactory, dwriteFactory, bitmapRenderTarget); } @@ -45,14 +44,15 @@ namespace Avalonia.Direct2D1.Media.Imaging { return new DrawingContextImpl( visualBrushRenderer, + this, _target, _dwriteFactory, WicImagingFactory); } - public IRenderTargetBitmapImpl CreateLayer(int pixelWidth, int pixelHeight) + public IRenderTargetBitmapImpl CreateLayer(Size size) { - return CreateCompatible(WicImagingFactory, _dwriteFactory, _target, pixelWidth, pixelHeight); + return CreateCompatible(WicImagingFactory, _dwriteFactory, _target, size); } public override void Dispose() diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicRenderTargetBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicRenderTargetBitmapImpl.cs index 1540ee333a..f1065370b5 100644 --- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicRenderTargetBitmapImpl.cs +++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WicRenderTargetBitmapImpl.cs @@ -47,7 +47,12 @@ namespace Avalonia.Direct2D1.Media public IDrawingContextImpl CreateDrawingContext(IVisualBrushRenderer visualBrushRenderer) { - return new DrawingContextImpl(visualBrushRenderer, _target, _dwriteFactory, WicImagingFactory); + return new DrawingContextImpl( + visualBrushRenderer, + null, + _target, + _dwriteFactory, + WicImagingFactory); } } } diff --git a/src/Windows/Avalonia.Direct2D1/RenderTarget.cs b/src/Windows/Avalonia.Direct2D1/RenderTarget.cs index cbeff8b2f1..6086b0c67c 100644 --- a/src/Windows/Avalonia.Direct2D1/RenderTarget.cs +++ b/src/Windows/Avalonia.Direct2D1/RenderTarget.cs @@ -3,6 +3,7 @@ using System; using Avalonia.Direct2D1.Media; +using Avalonia.Direct2D1.Media.Imaging; using Avalonia.Platform; using Avalonia.Rendering; using SharpDX.Direct2D1; @@ -11,7 +12,7 @@ using WicFactory = SharpDX.WIC.ImagingFactory; namespace Avalonia.Direct2D1 { - public class RenderTarget : IRenderTarget + public class RenderTarget : IRenderTarget, ILayerFactory { /// /// The render target. @@ -40,7 +41,16 @@ namespace Avalonia.Direct2D1 /// An . public IDrawingContextImpl CreateDrawingContext(IVisualBrushRenderer visualBrushRenderer) { - return new DrawingContextImpl(visualBrushRenderer, _renderTarget, DirectWriteFactory, WicFactory); + return new DrawingContextImpl(visualBrushRenderer, this, _renderTarget, DirectWriteFactory, WicFactory); + } + + public IRenderTargetBitmapImpl CreateLayer(Size size) + { + return D2DRenderTargetBitmapImpl.CreateCompatible( + WicFactory, + DirectWriteFactory, + _renderTarget, + size); } public void Dispose() diff --git a/src/Windows/Avalonia.Direct2D1/SwapChainRenderTarget.cs b/src/Windows/Avalonia.Direct2D1/SwapChainRenderTarget.cs index bd6555159c..0a23c63498 100644 --- a/src/Windows/Avalonia.Direct2D1/SwapChainRenderTarget.cs +++ b/src/Windows/Avalonia.Direct2D1/SwapChainRenderTarget.cs @@ -14,7 +14,7 @@ using Avalonia.Direct2D1.Media.Imaging; namespace Avalonia.Direct2D1 { - public abstract class SwapChainRenderTarget : IRenderTarget, ICreateLayer + public abstract class SwapChainRenderTarget : IRenderTarget, ILayerFactory { private Size2 _savedSize; private Size2F _savedDpi; @@ -56,13 +56,14 @@ namespace Avalonia.Direct2D1 return new DrawingContextImpl( visualBrushRenderer, + this, _deviceContext, DirectWriteFactory, WicImagingFactory, _swapChain); } - public IRenderTargetBitmapImpl CreateLayer(int pixelWidth, int pixelHeight) + public IRenderTargetBitmapImpl CreateLayer(Size size) { if (_deviceContext == null) { @@ -73,8 +74,7 @@ namespace Avalonia.Direct2D1 WicImagingFactory, DirectWriteFactory, _deviceContext, - pixelWidth, - pixelHeight); + size); } public void Dispose() From bb5a7f0cd3d1157885f5f2e140142f5a0adbf843 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Sat, 23 Sep 2017 20:54:06 -0700 Subject: [PATCH 04/40] Removed IRenderLayerFactory And use `IDrawingContextImpl.CreateLayer` instead. --- .../Rendering/DefaultRenderLayerFactory.cs | 34 --- .../Rendering/DeferredRenderer.cs | 153 ++++++------ .../Rendering/IRenderLayerFactory.cs | 11 - src/Avalonia.Visuals/Rendering/RenderLayer.cs | 10 +- .../Rendering/RenderLayers.cs | 9 +- .../Rendering/DeferredRendererTests.cs | 220 ++++++++---------- 6 files changed, 175 insertions(+), 262 deletions(-) delete mode 100644 src/Avalonia.Visuals/Rendering/DefaultRenderLayerFactory.cs delete mode 100644 src/Avalonia.Visuals/Rendering/IRenderLayerFactory.cs diff --git a/src/Avalonia.Visuals/Rendering/DefaultRenderLayerFactory.cs b/src/Avalonia.Visuals/Rendering/DefaultRenderLayerFactory.cs deleted file mode 100644 index c75f948b66..0000000000 --- a/src/Avalonia.Visuals/Rendering/DefaultRenderLayerFactory.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System; -using Avalonia.Platform; -using Avalonia.VisualTree; - -namespace Avalonia.Rendering -{ - public class DefaultRenderLayerFactory : IRenderLayerFactory - { - private IPlatformRenderInterface _renderInterface; - - public DefaultRenderLayerFactory() - : this(AvaloniaLocator.Current.GetService()) - { - } - - public DefaultRenderLayerFactory(IPlatformRenderInterface renderInterface) - { - _renderInterface = renderInterface; - } - - public IRenderTargetBitmapImpl CreateLayer( - IVisual layerRoot, - Size size, - double dpiX, - double dpiY) - { - return _renderInterface.CreateRenderTargetBitmap( - (int)Math.Ceiling(size.Width), - (int)Math.Ceiling(size.Height), - dpiX, - dpiY); - } - } -} diff --git a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs index c30fb3bdc3..d42f2bd8a4 100644 --- a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs +++ b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs @@ -26,7 +26,6 @@ namespace Avalonia.Rendering private readonly IVisual _root; private readonly ISceneBuilder _sceneBuilder; private readonly RenderLayers _layers; - private readonly IRenderLayerFactory _layerFactory; private bool _running; private Scene _scene; @@ -45,13 +44,11 @@ namespace Avalonia.Rendering /// The control to render. /// The render loop. /// The scene builder to use. Optional. - /// The layer factory to use. Optional. /// The dispatcher to use. Optional. public DeferredRenderer( IRenderRoot root, IRenderLoop renderLoop, ISceneBuilder sceneBuilder = null, - IRenderLayerFactory layerFactory = null, IDispatcher dispatcher = null) { Contract.Requires(root != null); @@ -59,8 +56,7 @@ namespace Avalonia.Rendering _dispatcher = dispatcher ?? Dispatcher.UIThread; _root = root; _sceneBuilder = sceneBuilder ?? new SceneBuilder(); - _layerFactory = layerFactory ?? new DefaultRenderLayerFactory(); - _layers = new RenderLayers(_layerFactory); + _layers = new RenderLayers(); _renderLoop = renderLoop; } @@ -70,15 +66,13 @@ namespace Avalonia.Rendering /// The control to render. /// The render target. /// The scene builder to use. Optional. - /// The layer factory to use. Optional. /// /// This constructor is intended to be used for unit testing. /// public DeferredRenderer( IVisual root, IRenderTarget renderTarget, - ISceneBuilder sceneBuilder = null, - IRenderLayerFactory layerFactory = null) + ISceneBuilder sceneBuilder = null) { Contract.Requires(root != null); Contract.Requires(renderTarget != null); @@ -86,8 +80,7 @@ namespace Avalonia.Rendering _root = root; _renderTarget = renderTarget; _sceneBuilder = sceneBuilder ?? new SceneBuilder(); - _layerFactory = layerFactory ?? new DefaultRenderLayerFactory(); - _layers = new RenderLayers(_layerFactory); + _layers = new RenderLayers(); } /// @@ -180,38 +173,56 @@ namespace Avalonia.Rendering bool renderOverlay = DrawDirtyRects || DrawFps; bool composite = false; + if (_renderTarget == null) + { + _renderTarget = ((IRenderRoot)_root).CreateRenderTarget(); + } + if (renderOverlay) { _dirtyRectsDisplay.Tick(); } - if (scene != null && scene.Size != Size.Empty) + try { - if (scene.Generation != _lastSceneId) + using (var context = _renderTarget.CreateDrawingContext(this)) { - _layers.Update(scene); - RenderToLayers(scene); - - if (DebugFramesPath != null) + if (scene != null && scene.Size != Size.Empty) { - SaveDebugFrames(scene.Generation); - } + if (scene.Generation != _lastSceneId) + { + _layers.Update(scene, context); - _lastSceneId = scene.Generation; + RenderToLayers(scene); - composite = true; - } + if (DebugFramesPath != null) + { + SaveDebugFrames(scene.Generation); + } - if (renderOverlay) - { - RenderOverlay(scene); - RenderComposite(scene); - } - else if(composite) - { - RenderComposite(scene); + _lastSceneId = scene.Generation; + + composite = true; + } + + if (renderOverlay) + { + RenderOverlay(scene, context); + RenderComposite(scene, context); + } + else if (composite) + { + RenderComposite(scene, context); + } + } } } + catch (RenderTargetCorruptedException ex) + { + Logging.Logger.Information("Renderer", this, "Render target was corrupted. Exception: {0}", ex); + _renderTarget?.Dispose(); + _renderTarget = null; + } } private void Render(IDrawingContextImpl context, VisualNode node, IVisual layer, Rect clipBounds) @@ -273,11 +284,11 @@ namespace Avalonia.Rendering } } - private void RenderOverlay(Scene scene) + private void RenderOverlay(Scene scene, IDrawingContextImpl parentContent) { if (DrawDirtyRects) { - var overlay = GetOverlay(scene.Size, scene.Scaling); + var overlay = GetOverlay(parentContent, scene.Size, scene.Scaling); using (var context = overlay.CreateDrawingContext(this)) { @@ -301,61 +312,44 @@ namespace Avalonia.Rendering } } - private void RenderComposite(Scene scene) + private void RenderComposite(Scene scene, IDrawingContextImpl context) { - try + var clientRect = new Rect(scene.Size); + + foreach (var layer in scene.Layers) { - if (_renderTarget == null) + var bitmap = _layers[layer.LayerRoot].Bitmap; + var sourceRect = new Rect(0, 0, bitmap.PixelWidth, bitmap.PixelHeight); + + if (layer.GeometryClip != null) { - _renderTarget = ((IRenderRoot)_root).CreateRenderTarget(); + context.PushGeometryClip(layer.GeometryClip); } - using (var context = _renderTarget.CreateDrawingContext(this)) + if (layer.OpacityMask == null) { - var clientRect = new Rect(scene.Size); - - foreach (var layer in scene.Layers) - { - var bitmap = _layers[layer.LayerRoot].Bitmap; - var sourceRect = new Rect(0, 0, bitmap.PixelWidth, bitmap.PixelHeight); - - if (layer.GeometryClip != null) - { - context.PushGeometryClip(layer.GeometryClip); - } - - if (layer.OpacityMask == null) - { - context.DrawImage(bitmap, layer.Opacity, sourceRect, clientRect); - } - else - { - context.DrawImage(bitmap, layer.OpacityMask, layer.OpacityMaskRect, sourceRect); - } - - if (layer.GeometryClip != null) - { - context.PopGeometryClip(); - } - } - - if (_overlay != null) - { - var sourceRect = new Rect(0, 0, _overlay.PixelWidth, _overlay.PixelHeight); - context.DrawImage(_overlay, 0.5, sourceRect, clientRect); - } + context.DrawImage(bitmap, layer.Opacity, sourceRect, clientRect); + } + else + { + context.DrawImage(bitmap, layer.OpacityMask, layer.OpacityMaskRect, sourceRect); + } - if (DrawFps) - { - RenderFps(context, clientRect, true); - } + if (layer.GeometryClip != null) + { + context.PopGeometryClip(); } } - catch (RenderTargetCorruptedException ex) + + if (_overlay != null) { - Logging.Logger.Information("Renderer", this, "Render target was corrupted. Exception: {0}", ex); - _renderTarget?.Dispose(); - _renderTarget = null; + var sourceRect = new Rect(0, 0, _overlay.PixelWidth, _overlay.PixelHeight); + context.DrawImage(_overlay, 0.5, sourceRect, clientRect); + } + + if (DrawFps) + { + RenderFps(context, clientRect, true); } } @@ -422,7 +416,10 @@ namespace Avalonia.Rendering } } - private IRenderTargetBitmapImpl GetOverlay(Size size, double scaling) + private IRenderTargetBitmapImpl GetOverlay( + IDrawingContextImpl parentContext, + Size size, + double scaling) { size = new Size(size.Width * scaling, size.Height * scaling); @@ -431,7 +428,7 @@ namespace Avalonia.Rendering _overlay.PixelHeight != size.Height) { _overlay?.Dispose(); - _overlay = _layerFactory.CreateLayer(null, size, 96 * scaling, 96 * scaling); + _overlay = parentContext.CreateLayer(size); } return _overlay; diff --git a/src/Avalonia.Visuals/Rendering/IRenderLayerFactory.cs b/src/Avalonia.Visuals/Rendering/IRenderLayerFactory.cs deleted file mode 100644 index ed2751cd64..0000000000 --- a/src/Avalonia.Visuals/Rendering/IRenderLayerFactory.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using Avalonia.Platform; -using Avalonia.VisualTree; - -namespace Avalonia.Rendering -{ - public interface IRenderLayerFactory - { - IRenderTargetBitmapImpl CreateLayer(IVisual layerRoot, Size size, double dpiX, double dpiY); - } -} diff --git a/src/Avalonia.Visuals/Rendering/RenderLayer.cs b/src/Avalonia.Visuals/Rendering/RenderLayer.cs index df9497af6f..ed33295db6 100644 --- a/src/Avalonia.Visuals/Rendering/RenderLayer.cs +++ b/src/Avalonia.Visuals/Rendering/RenderLayer.cs @@ -7,16 +7,16 @@ namespace Avalonia.Rendering { public class RenderLayer { - private readonly IRenderLayerFactory _factory; + private readonly IDrawingContextImpl _drawingContext; public RenderLayer( - IRenderLayerFactory factory, + IDrawingContextImpl drawingContext, Size size, double scaling, IVisual layerRoot) { - _factory = factory; - Bitmap = factory.CreateLayer(layerRoot, size * scaling, 96 * scaling, 96 * scaling); + _drawingContext = drawingContext; + Bitmap = drawingContext.CreateLayer(size); Size = size; Scaling = scaling; LayerRoot = layerRoot; @@ -31,7 +31,7 @@ namespace Avalonia.Rendering { if (Size != size || Scaling != scaling) { - var resized = _factory.CreateLayer(LayerRoot, size * scaling, 96 * scaling, 96 * scaling); + var resized = _drawingContext.CreateLayer(size); using (var context = resized.CreateDrawingContext(null)) { diff --git a/src/Avalonia.Visuals/Rendering/RenderLayers.cs b/src/Avalonia.Visuals/Rendering/RenderLayers.cs index e1b22c55e0..bafd644603 100644 --- a/src/Avalonia.Visuals/Rendering/RenderLayers.cs +++ b/src/Avalonia.Visuals/Rendering/RenderLayers.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; +using Avalonia.Platform; using Avalonia.Rendering.SceneGraph; using Avalonia.VisualTree; @@ -8,19 +9,17 @@ namespace Avalonia.Rendering { public class RenderLayers : IEnumerable { - private readonly IRenderLayerFactory _factory; private List _inner = new List(); private Dictionary _index = new Dictionary(); - public RenderLayers(IRenderLayerFactory factory) + public RenderLayers() { - _factory = factory; } public int Count => _inner.Count; public RenderLayer this[IVisual layerRoot] => _index[layerRoot]; - public void Update(Scene scene) + public void Update(Scene scene, IDrawingContextImpl context) { for (var i = scene.Layers.Count - 1; i >= 0; --i) { @@ -29,7 +28,7 @@ namespace Avalonia.Rendering if (!_index.TryGetValue(src.LayerRoot, out layer)) { - layer = new RenderLayer(_factory, scene.Size, scene.Scaling, src.LayerRoot); + layer = new RenderLayer(context, scene.Size, scene.Scaling, src.LayerRoot); _inner.Add(layer); _index.Add(src.LayerRoot, layer); } diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs index a9b27ed601..047cb05c26 100644 --- a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs +++ b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs @@ -30,7 +30,6 @@ namespace Avalonia.Visuals.UnitTests.Rendering root, loop.Object, sceneBuilder: MockSceneBuilder(root).Object, - layerFactory: MockLayerFactory(root).Object, dispatcher: dispatcher.Object); target.Start(); @@ -55,7 +54,6 @@ namespace Avalonia.Visuals.UnitTests.Rendering root, loop.Object, sceneBuilder: sceneBuilder.Object, - layerFactory: MockLayerFactory(root).Object, dispatcher: dispatcher); target.Start(); @@ -75,7 +73,6 @@ namespace Avalonia.Visuals.UnitTests.Rendering root, loop.Object, sceneBuilder: sceneBuilder.Object, - layerFactory: MockLayerFactory(root).Object, dispatcher: dispatcher); target.Start(); @@ -111,7 +108,6 @@ namespace Avalonia.Visuals.UnitTests.Rendering root, loop.Object, sceneBuilder: sceneBuilder.Object, - layerFactory: MockLayerFactory(root).Object, dispatcher: dispatcher); target.Start(); @@ -133,100 +129,102 @@ namespace Avalonia.Visuals.UnitTests.Rendering [Fact] public void Frame_Should_Create_Layer_For_Root() { - var loop = new Mock(); - var root = new TestRoot(); - var rootLayer = new Mock(); - var dispatcher = new ImmediateDispatcher(); - - var sceneBuilder = new Mock(); - sceneBuilder.Setup(x => x.UpdateAll(It.IsAny())) - .Callback(scene => - { - scene.Size = root.ClientSize; - scene.Layers.Add(root).Dirty.Add(new Rect(root.ClientSize)); - }); - - var layers = new Mock(); - layers.Setup(x => x.CreateLayer(root, root.ClientSize, 96, 96)).Returns(CreateLayer()); - - var renderInterface = new Mock(); - - var target = new DeferredRenderer( - root, - loop.Object, - sceneBuilder: sceneBuilder.Object, - layerFactory: layers.Object, - dispatcher: dispatcher); - - target.Start(); - RunFrame(loop); - - layers.Verify(x => x.CreateLayer(root, root.ClientSize, 96, 96)); + throw new NotImplementedException(); + //var loop = new Mock(); + //var root = new TestRoot(); + //var rootLayer = new Mock(); + //var dispatcher = new ImmediateDispatcher(); + + //var sceneBuilder = new Mock(); + //sceneBuilder.Setup(x => x.UpdateAll(It.IsAny())) + // .Callback(scene => + // { + // scene.Size = root.ClientSize; + // scene.Layers.Add(root).Dirty.Add(new Rect(root.ClientSize)); + // }); + + //var layers = new Mock(); + //layers.Setup(x => x.CreateLayer(root, root.ClientSize, 96, 96)).Returns(CreateLayer()); + + //var renderInterface = new Mock(); + + //var target = new DeferredRenderer( + // root, + // loop.Object, + // sceneBuilder: sceneBuilder.Object, + // layerFactory: layers.Object, + // dispatcher: dispatcher); + + //target.Start(); + //RunFrame(loop); + + //layers.Verify(x => x.CreateLayer(root, root.ClientSize, 96, 96)); } [Fact] public void Should_Create_And_Delete_Layers_For_Transparent_Controls() { - Border border; - var root = new TestRoot - { - Width = 100, - Height = 100, - Child = new Border - { - Background = Brushes.Red, - Child = border = new Border - { - Background = Brushes.Green, - } - } - }; - - root.Measure(Size.Infinity); - root.Arrange(new Rect(root.DesiredSize)); - - var loop = new Mock(); - var layerFactory = new MockRenderLayerFactory(new Dictionary - { - { root, CreateLayer() }, - { border, CreateLayer() }, - }); - - var target = new DeferredRenderer( - root, - loop.Object, - layerFactory: layerFactory, - dispatcher: new ImmediateDispatcher()); - root.Renderer = target; - - target.Start(); - RunFrame(loop); - - var rootContext = layerFactory.GetMockDrawingContext(root); - var borderContext = layerFactory.GetMockDrawingContext(border); - - rootContext.Verify(x => x.FillRectangle(Brushes.Red, new Rect(0, 0, 100, 100), 0), Times.Once); - rootContext.Verify(x => x.FillRectangle(Brushes.Green, new Rect(0, 0, 100, 100), 0), Times.Once); - borderContext.Verify(x => x.FillRectangle(It.IsAny(), It.IsAny(), It.IsAny()), Times.Never); - - rootContext.ResetCalls(); - borderContext.ResetCalls(); - border.Opacity = 0.5; - RunFrame(loop); - - rootContext.Verify(x => x.FillRectangle(Brushes.Red, new Rect(0, 0, 100, 100), 0), Times.Once); - rootContext.Verify(x => x.FillRectangle(Brushes.Green, new Rect(0, 0, 100, 100), 0), Times.Never); - borderContext.Verify(x => x.FillRectangle(Brushes.Green, new Rect(0, 0, 100, 100), 0), Times.Once); - - rootContext.ResetCalls(); - borderContext.ResetCalls(); - border.Opacity = 1; - RunFrame(loop); - - layerFactory.GetMockBitmap(border).Verify(x => x.Dispose()); - rootContext.Verify(x => x.FillRectangle(Brushes.Red, new Rect(0, 0, 100, 100), 0), Times.Once); - rootContext.Verify(x => x.FillRectangle(Brushes.Green, new Rect(0, 0, 100, 100), 0), Times.Once); - borderContext.Verify(x => x.FillRectangle(It.IsAny(), It.IsAny(), It.IsAny()), Times.Never); + throw new NotImplementedException(); + //Border border; + //var root = new TestRoot + //{ + // Width = 100, + // Height = 100, + // Child = new Border + // { + // Background = Brushes.Red, + // Child = border = new Border + // { + // Background = Brushes.Green, + // } + // } + //}; + + //root.Measure(Size.Infinity); + //root.Arrange(new Rect(root.DesiredSize)); + + //var loop = new Mock(); + //var layerFactory = new MockRenderLayerFactory(new Dictionary + //{ + // { root, CreateLayer() }, + // { border, CreateLayer() }, + //}); + + //var target = new DeferredRenderer( + // root, + // loop.Object, + // layerFactory: layerFactory, + // dispatcher: new ImmediateDispatcher()); + //root.Renderer = target; + + //target.Start(); + //RunFrame(loop); + + //var rootContext = layerFactory.GetMockDrawingContext(root); + //var borderContext = layerFactory.GetMockDrawingContext(border); + + //rootContext.Verify(x => x.FillRectangle(Brushes.Red, new Rect(0, 0, 100, 100), 0), Times.Once); + //rootContext.Verify(x => x.FillRectangle(Brushes.Green, new Rect(0, 0, 100, 100), 0), Times.Once); + //borderContext.Verify(x => x.FillRectangle(It.IsAny(), It.IsAny(), It.IsAny()), Times.Never); + + //rootContext.ResetCalls(); + //borderContext.ResetCalls(); + //border.Opacity = 0.5; + //RunFrame(loop); + + //rootContext.Verify(x => x.FillRectangle(Brushes.Red, new Rect(0, 0, 100, 100), 0), Times.Once); + //rootContext.Verify(x => x.FillRectangle(Brushes.Green, new Rect(0, 0, 100, 100), 0), Times.Never); + //borderContext.Verify(x => x.FillRectangle(Brushes.Green, new Rect(0, 0, 100, 100), 0), Times.Once); + + //rootContext.ResetCalls(); + //borderContext.ResetCalls(); + //border.Opacity = 1; + //RunFrame(loop); + + //layerFactory.GetMockBitmap(border).Verify(x => x.Dispose()); + //rootContext.Verify(x => x.FillRectangle(Brushes.Red, new Rect(0, 0, 100, 100), 0), Times.Once); + //rootContext.Verify(x => x.FillRectangle(Brushes.Green, new Rect(0, 0, 100, 100), 0), Times.Once); + //borderContext.Verify(x => x.FillRectangle(It.IsAny(), It.IsAny(), It.IsAny()), Times.Never); } private void IgnoreFirstFrame(Mock loop, Mock sceneBuilder) @@ -246,13 +244,6 @@ namespace Avalonia.Visuals.UnitTests.Rendering x.CreateDrawingContext(It.IsAny()) == Mock.Of()); } - private Mock MockLayerFactory(IRenderRoot root) - { - var result = new Mock(); - result.Setup(x => x.CreateLayer(root, root.ClientSize, 96, 96)).Returns(CreateLayer()); - return result; - } - private Mock MockSceneBuilder(IRenderRoot root) { var result = new Mock(); @@ -260,34 +251,5 @@ namespace Avalonia.Visuals.UnitTests.Rendering .Callback(x => x.Layers.Add(root).Dirty.Add(new Rect(root.ClientSize))); return result; } - - private class MockRenderLayerFactory : IRenderLayerFactory - { - private IDictionary _layers; - - public MockRenderLayerFactory(IDictionary layers) - { - _layers = layers; - } - - public IRenderTargetBitmapImpl CreateLayer( - IVisual layerRoot, - Size size, - double dpiX, - double dpiY) - { - return _layers[layerRoot]; - } - - public Mock GetMockBitmap(IVisual layerRoot) - { - return Mock.Get(_layers[layerRoot]); - } - - public Mock GetMockDrawingContext(IVisual layerRoot) - { - return Mock.Get(_layers[layerRoot].CreateDrawingContext(null)); - } - } } } From d141acab30da31254360613b12184180239fa6c4 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Sat, 23 Sep 2017 20:59:41 -0700 Subject: [PATCH 05/40] Use correct size for overlay. --- src/Avalonia.Visuals/Rendering/DeferredRenderer.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs index d42f2bd8a4..81a2998fd2 100644 --- a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs +++ b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs @@ -421,11 +421,11 @@ namespace Avalonia.Rendering Size size, double scaling) { - size = new Size(size.Width * scaling, size.Height * scaling); + var pixelSize = size * scaling; if (_overlay == null || - _overlay.PixelWidth != size.Width || - _overlay.PixelHeight != size.Height) + _overlay.PixelWidth != pixelSize.Width || + _overlay.PixelHeight != pixelSize.Height) { _overlay?.Dispose(); _overlay = parentContext.CreateLayer(size); From b0d8ff69ea300769018181a6d604bbde1f4118dc Mon Sep 17 00:00:00 2001 From: Dmitriy Arndt Date: Tue, 26 Sep 2017 00:11:32 +0300 Subject: [PATCH 06/40] Fixed: MenuItem with sub-items is not closed when other menu item without sub-items is selected #226 --- src/Avalonia.Controls/MenuItem.cs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/Avalonia.Controls/MenuItem.cs b/src/Avalonia.Controls/MenuItem.cs index 926c240e57..dadd3b910b 100644 --- a/src/Avalonia.Controls/MenuItem.cs +++ b/src/Avalonia.Controls/MenuItem.cs @@ -307,6 +307,21 @@ namespace Avalonia.Controls () => IsSubMenuOpen = true, TimeSpan.FromMilliseconds(400)); } + else + { + var parentItem = Parent as MenuItem; + if (parentItem != null) + { + foreach (var sibling in parentItem.Items + .OfType() + .Where(x => x != this && x.IsSubMenuOpen)) + { + sibling.CloseSubmenus(); + sibling.IsSubMenuOpen = false; + sibling.IsSelected = false; + } + } + } } /// From 79535609b69cb71d02ef2c7e79b509d6fe932337 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Fri, 29 Sep 2017 17:34:28 +0200 Subject: [PATCH 07/40] Use DynamicResource instead of StyleResource Fixes #1165 --- samples/ControlCatalog/Pages/ToolTipPage.xaml | 4 ++-- src/Avalonia.Themes.Default/RepeatButton.xaml | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/samples/ControlCatalog/Pages/ToolTipPage.xaml b/samples/ControlCatalog/Pages/ToolTipPage.xaml index 5cf7fee4d1..aa7d60bd11 100644 --- a/samples/ControlCatalog/Pages/ToolTipPage.xaml +++ b/samples/ControlCatalog/Pages/ToolTipPage.xaml @@ -10,7 +10,7 @@ HorizontalAlignment="Center"> @@ -24,7 +24,7 @@ diff --git a/src/Avalonia.Themes.Default/RepeatButton.xaml b/src/Avalonia.Themes.Default/RepeatButton.xaml index 557e2d3b03..1caaa266de 100644 --- a/src/Avalonia.Themes.Default/RepeatButton.xaml +++ b/src/Avalonia.Themes.Default/RepeatButton.xaml @@ -1,13 +1,13 @@ \ No newline at end of file From 7cb4485dfb98973ccd77e7ec74c585526313afdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Pedro?= Date: Sun, 1 Oct 2017 13:27:44 +0100 Subject: [PATCH 08/40] Added Orientation and IsIndeterminate properties to ProgressBar. Moved the Orientation enum to a separate file. --- samples/ControlCatalog/ControlCatalog.csproj | 6 + samples/ControlCatalog/MainView.xaml | 1 + .../ControlCatalog/Pages/ProgressBarPage.xaml | 24 ++++ .../Pages/ProgressBarPage.xaml.cs | 18 +++ src/Avalonia.Controls/Orientation.cs | 21 ++++ src/Avalonia.Controls/Primitives/ScrollBar.cs | 2 +- src/Avalonia.Controls/ProgressBar.cs | 104 +++++++++++++++++- src/Avalonia.Controls/StackPanel.cs | 18 +-- src/Avalonia.Themes.Default/ProgressBar.xaml | 5 +- 9 files changed, 174 insertions(+), 25 deletions(-) create mode 100644 samples/ControlCatalog/Pages/ProgressBarPage.xaml create mode 100644 samples/ControlCatalog/Pages/ProgressBarPage.xaml.cs create mode 100644 src/Avalonia.Controls/Orientation.cs diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj index 340905a7f7..11ff531514 100644 --- a/samples/ControlCatalog/ControlCatalog.csproj +++ b/samples/ControlCatalog/ControlCatalog.csproj @@ -69,6 +69,9 @@ Designer + + Designer + Designer @@ -131,6 +134,9 @@ MenuPage.xaml + + ProgressBarPage.xaml + RadioButtonPage.xaml diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml index 6c432a90ac..0940316ce9 100644 --- a/samples/ControlCatalog/MainView.xaml +++ b/samples/ControlCatalog/MainView.xaml @@ -16,6 +16,7 @@ + diff --git a/samples/ControlCatalog/Pages/ProgressBarPage.xaml b/samples/ControlCatalog/Pages/ProgressBarPage.xaml new file mode 100644 index 0000000000..bf40e68630 --- /dev/null +++ b/samples/ControlCatalog/Pages/ProgressBarPage.xaml @@ -0,0 +1,24 @@ + + + ProgressBar + A progress bar control + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/samples/ControlCatalog/Pages/ProgressBarPage.xaml.cs b/samples/ControlCatalog/Pages/ProgressBarPage.xaml.cs new file mode 100644 index 0000000000..56792b3908 --- /dev/null +++ b/samples/ControlCatalog/Pages/ProgressBarPage.xaml.cs @@ -0,0 +1,18 @@ +using Avalonia.Controls; +using Avalonia.Markup.Xaml; + +namespace ControlCatalog.Pages +{ + public class ProgressBarPage : UserControl + { + public ProgressBarPage() + { + this.InitializeComponent(); + } + + private void InitializeComponent() + { + AvaloniaXamlLoader.Load(this); + } + } +} diff --git a/src/Avalonia.Controls/Orientation.cs b/src/Avalonia.Controls/Orientation.cs new file mode 100644 index 0000000000..fe998c024a --- /dev/null +++ b/src/Avalonia.Controls/Orientation.cs @@ -0,0 +1,21 @@ +// Copyright (c) The Avalonia Project. All rights reserved. +// Licensed under the MIT license. See licence.md file in the project root for full license information. + +namespace Avalonia.Controls +{ + /// + /// Defines vertical or horizontal orientation. + /// + public enum Orientation + { + /// + /// Horizontal orientation. + /// + Horizontal, + + /// + /// Vertical orientation. + /// + Vertical, + } +} diff --git a/src/Avalonia.Controls/Primitives/ScrollBar.cs b/src/Avalonia.Controls/Primitives/ScrollBar.cs index 0f69e4e5bc..009e1d0ab8 100644 --- a/src/Avalonia.Controls/Primitives/ScrollBar.cs +++ b/src/Avalonia.Controls/Primitives/ScrollBar.cs @@ -30,7 +30,7 @@ namespace Avalonia.Controls.Primitives /// Defines the property. /// public static readonly StyledProperty OrientationProperty = - AvaloniaProperty.Register(nameof(Orientation)); + AvaloniaProperty.Register(nameof(Orientation), Orientation.Vertical); private Button _lineUpButton; private Button _lineDownButton; diff --git a/src/Avalonia.Controls/ProgressBar.cs b/src/Avalonia.Controls/ProgressBar.cs index a31a27ddfe..015b0a6e96 100644 --- a/src/Avalonia.Controls/ProgressBar.cs +++ b/src/Avalonia.Controls/ProgressBar.cs @@ -1,8 +1,12 @@ // Copyright (c) The Avalonia Project. All rights reserved. // Licensed under the MIT license. See licence.md file in the project root for full license information. +using System; +using System.Reactive.Linq; + +using Avalonia.Animation; using Avalonia.Controls.Primitives; -using Avalonia.Controls.Templates; +using Avalonia.Layout; namespace Avalonia.Controls { @@ -11,11 +15,41 @@ namespace Avalonia.Controls /// public class ProgressBar : RangeBase { + public static readonly StyledProperty IsIndeterminateProperty = + AvaloniaProperty.Register(nameof(IsIndeterminate)); + + public static readonly StyledProperty OrientationProperty = + AvaloniaProperty.Register(nameof(Orientation), Orientation.Horizontal); + private Border _indicator; + private IDisposable _indeterminateBindSubscription; static ProgressBar() { ValueProperty.Changed.AddClassHandler(x => x.ValueChanged); + + HorizontalAlignmentProperty.OverrideDefaultValue(HorizontalAlignment.Left); + VerticalAlignmentProperty.OverrideDefaultValue(VerticalAlignment.Top); + } + + public bool IsIndeterminate + { + get => GetValue(IsIndeterminateProperty); + set + { + SetValue(IsIndeterminateProperty, value); + UpdateIsIndeterminate(value); + } + } + + public Orientation Orientation + { + get => GetValue(OrientationProperty); + set + { + SetValue(OrientationProperty, value); + UpdateOrientation(value); + } } /// @@ -29,16 +63,80 @@ namespace Avalonia.Controls protected override void OnTemplateApplied(TemplateAppliedEventArgs e) { _indicator = e.NameScope.Get("PART_Indicator"); + UpdateIndicator(Bounds.Size); + UpdateOrientation(Orientation); + UpdateIsIndeterminate(IsIndeterminate); } private void UpdateIndicator(Size bounds) { if (_indicator != null) { - double percent = Maximum == Minimum ? 1.0 : (Value - Minimum) / (Maximum - Minimum); - _indicator.Width = bounds.Width * percent; + if (IsIndeterminate) + { + if (Orientation == Orientation.Horizontal) + _indicator.Width = bounds.Width / 5.0; + else + _indicator.Height = bounds.Height / 5.0; + } + else + { + double percent = Maximum == Minimum ? 1.0 : (Value - Minimum) / (Maximum - Minimum); + + if (Orientation == Orientation.Horizontal) + _indicator.Width = bounds.Width * percent; + else + _indicator.Height = bounds.Height * percent; + } + } + } + + private void UpdateOrientation(Orientation orientation) + { + if (orientation == Orientation.Horizontal) + { + MinHeight = 14; + MinWidth = 200; + + _indicator.HorizontalAlignment = HorizontalAlignment.Left; + _indicator.VerticalAlignment = VerticalAlignment.Stretch; + } + else + { + MinHeight = 200; + MinWidth = 14; + + _indicator.HorizontalAlignment = HorizontalAlignment.Stretch; + _indicator.VerticalAlignment = VerticalAlignment.Bottom; + } + } + + private void UpdateIsIndeterminate(bool isIndeterminate) + { + if (isIndeterminate) + { + var start = Animate.Stopwatch.Elapsed; + + if (Orientation == Orientation.Horizontal) + { + _indeterminateBindSubscription = Animate.Timer.TakeWhile(x => (x - start).TotalSeconds <= 4.0) + .Select(x => new Rect(-_indicator.Width - 5 + (x - start).TotalSeconds / 4.0 * (Bounds.Width + _indicator.Width + 10), 0, _indicator.Bounds.Width, _indicator.Bounds.Height)) + .Finally(() => start = Animate.Stopwatch.Elapsed) + .Repeat() + .Subscribe(x => _indicator.Arrange(x)); + } + else + { + _indeterminateBindSubscription = Animate.Timer.TakeWhile(x => (x - start).TotalSeconds <= 4.0) + .Select(x => new Rect(0, Bounds.Height + 5 - (x - start).TotalSeconds / 4.0 * (Bounds.Height + _indicator.Height + 10), _indicator.Bounds.Width, _indicator.Bounds.Height)) + .Finally(() => start = Animate.Stopwatch.Elapsed) + .Repeat() + .Subscribe(x => _indicator.Arrange(x)); + } } + else + _indeterminateBindSubscription?.Dispose(); } private void ValueChanged(AvaloniaPropertyChangedEventArgs e) diff --git a/src/Avalonia.Controls/StackPanel.cs b/src/Avalonia.Controls/StackPanel.cs index 26a755e5f1..0e12fb3283 100644 --- a/src/Avalonia.Controls/StackPanel.cs +++ b/src/Avalonia.Controls/StackPanel.cs @@ -6,22 +6,6 @@ using Avalonia.Input; namespace Avalonia.Controls { - /// - /// Defines vertical or horizontal orientation. - /// - public enum Orientation - { - /// - /// Vertical orientation. - /// - Vertical, - - /// - /// Horizontal orientation. - /// - Horizontal, - } - /// /// A panel which lays out its children horizontally or vertically. /// @@ -37,7 +21,7 @@ namespace Avalonia.Controls /// Defines the property. /// public static readonly StyledProperty OrientationProperty = - AvaloniaProperty.Register(nameof(Orientation)); + AvaloniaProperty.Register(nameof(Orientation), Orientation.Vertical); /// /// Initializes static members of the class. diff --git a/src/Avalonia.Themes.Default/ProgressBar.xaml b/src/Avalonia.Themes.Default/ProgressBar.xaml index 4acff26537..82f385e16b 100644 --- a/src/Avalonia.Themes.Default/ProgressBar.xaml +++ b/src/Avalonia.Themes.Default/ProgressBar.xaml @@ -1,8 +1,6 @@