diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 39333f37ba..3f4fbb0d50 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -32,7 +32,7 @@ jobs: - job: macOS pool: - vmImage: 'xcode9-macos10.13' + vmImage: 'macOS-10.14' steps: - task: DotNetCoreInstaller@0 inputs: @@ -49,7 +49,7 @@ jobs: inputs: actions: 'build' scheme: '' - sdk: 'macosx10.13' + sdk: 'macosx10.14' configuration: 'Release' xcWorkspacePath: '**/*.xcodeproj/project.xcworkspace' xcodeVersion: 'default' # Options: 8, 9, default, specifyPath diff --git a/build/SharedVersion.props b/build/SharedVersion.props index b46ac16a79..4f0b1f0a5b 100644 --- a/build/SharedVersion.props +++ b/build/SharedVersion.props @@ -2,8 +2,8 @@ xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> Avalonia - 0.7.1 - Copyright 2018 © The AvaloniaUI Project + 0.8.1 + Copyright 2019 © The AvaloniaUI Project https://github.com/AvaloniaUI/Avalonia/blob/master/licence.md https://github.com/AvaloniaUI/Avalonia/ https://github.com/AvaloniaUI/Avalonia/ @@ -11,4 +11,4 @@ CS1591 latest - \ No newline at end of file + diff --git a/nukebuild/Build.cs b/nukebuild/Build.cs index bb31034299..84092d52eb 100644 --- a/nukebuild/Build.cs +++ b/nukebuild/Build.cs @@ -122,6 +122,14 @@ partial class Build : NukeBuild foreach(var fw in frameworks) { + if (fw.StartsWith("net4") + && RuntimeInformation.IsOSPlatform(OSPlatform.Linux) + && Environment.GetEnvironmentVariable("FORCE_LINUX_TESTS") != "1") + { + Information($"Skipping {fw} tests on Linux - https://github.com/mono/mono/issues/13969"); + continue; + } + Information("Running for " + fw); DotNetTest(c => { diff --git a/nukebuild/Numerge b/nukebuild/Numerge index 4464343aef..aef10ae67d 160000 --- a/nukebuild/Numerge +++ b/nukebuild/Numerge @@ -1 +1 @@ -Subproject commit 4464343aef5c8ab7a42fcb20a483a6058199f8b8 +Subproject commit aef10ae67dc55c95f49b52a505a0be33bfa297a5 diff --git a/samples/BindingDemo/App.xaml.cs b/samples/BindingDemo/App.xaml.cs index 01c52a2a49..f2f44cd502 100644 --- a/samples/BindingDemo/App.xaml.cs +++ b/samples/BindingDemo/App.xaml.cs @@ -3,6 +3,7 @@ using Avalonia; using Avalonia.Controls; using Avalonia.Logging.Serilog; using Avalonia.Markup.Xaml; +using Avalonia.ReactiveUI; using Serilog; namespace BindingDemo diff --git a/samples/ControlCatalog.Desktop/Program.cs b/samples/ControlCatalog.Desktop/Program.cs index dd5644dd6b..b7aa34f5ba 100644 --- a/samples/ControlCatalog.Desktop/Program.cs +++ b/samples/ControlCatalog.Desktop/Program.cs @@ -4,6 +4,7 @@ using Avalonia; using Avalonia.Controls; using Avalonia.Logging.Serilog; using Avalonia.Platform; +using Avalonia.ReactiveUI; using Serilog; namespace ControlCatalog diff --git a/samples/ControlCatalog.NetCore/Program.cs b/samples/ControlCatalog.NetCore/Program.cs index d13a5b5ef3..c8f3fb9921 100644 --- a/samples/ControlCatalog.NetCore/Program.cs +++ b/samples/ControlCatalog.NetCore/Program.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Threading; using Avalonia; using Avalonia.Skia; +using Avalonia.ReactiveUI; namespace ControlCatalog.NetCore { diff --git a/samples/RenderDemo/App.xaml.cs b/samples/RenderDemo/App.xaml.cs index 0f627961e6..d95018520a 100644 --- a/samples/RenderDemo/App.xaml.cs +++ b/samples/RenderDemo/App.xaml.cs @@ -4,6 +4,7 @@ using Avalonia; using Avalonia.Logging.Serilog; using Avalonia.Markup.Xaml; +using Avalonia.ReactiveUI; namespace RenderDemo { diff --git a/samples/RenderDemo/MainWindow.xaml b/samples/RenderDemo/MainWindow.xaml index 41164c7780..c15abad188 100644 --- a/samples/RenderDemo/MainWindow.xaml +++ b/samples/RenderDemo/MainWindow.xaml @@ -33,6 +33,9 @@ + + + diff --git a/samples/RenderDemo/Pages/CustomSkiaPage.cs b/samples/RenderDemo/Pages/CustomSkiaPage.cs new file mode 100644 index 0000000000..2e59d934a1 --- /dev/null +++ b/samples/RenderDemo/Pages/CustomSkiaPage.cs @@ -0,0 +1,119 @@ +using System; +using System.Diagnostics; +using Avalonia; +using Avalonia.Controls; +using Avalonia.Media; +using Avalonia.Platform; +using Avalonia.Rendering.SceneGraph; +using Avalonia.Skia; +using Avalonia.Threading; +using SkiaSharp; + +namespace RenderDemo.Pages +{ + public class CustomSkiaPage : Control + { + public CustomSkiaPage() + { + ClipToBounds = true; + } + + class CustomDrawOp : ICustomDrawOperation + { + private readonly FormattedText _noSkia; + + public CustomDrawOp(Rect bounds, FormattedText noSkia) + { + _noSkia = noSkia; + Bounds = bounds; + } + + public void Dispose() + { + // No-op + } + + public Rect Bounds { get; } + public bool HitTest(Point p) => false; + public bool Equals(ICustomDrawOperation other) => false; + static Stopwatch St = Stopwatch.StartNew(); + public void Render(IDrawingContextImpl context) + { + var canvas = (context as ISkiaDrawingContextImpl)?.SkCanvas; + if (canvas == null) + context.DrawText(Brushes.Black, new Point(), _noSkia.PlatformImpl); + else + { + canvas.Save(); + // create the first shader + var colors = new SKColor[] { + new SKColor(0, 255, 255), + new SKColor(255, 0, 255), + new SKColor(255, 255, 0), + new SKColor(0, 255, 255) + }; + + var sx = Animate(100, 2, 10); + var sy = Animate(1000, 5, 15); + var lightPosition = new SKPoint( + (float)(Bounds.Width / 2 + Math.Cos(St.Elapsed.TotalSeconds) * Bounds.Width / 4), + (float)(Bounds.Height / 2 + Math.Sin(St.Elapsed.TotalSeconds) * Bounds.Height / 4)); + using (var sweep = + SKShader.CreateSweepGradient(new SKPoint((int)Bounds.Width / 2, (int)Bounds.Height / 2), colors, + null)) + using(var turbulence = SKShader.CreatePerlinNoiseFractalNoise(0.05f, 0.05f, 4, 0)) + using(var shader = SKShader.CreateCompose(sweep, turbulence, SKBlendMode.SrcATop)) + using(var blur = SKImageFilter.CreateBlur(Animate(100, 2, 10), Animate(100, 5, 15))) + using (var paint = new SKPaint + { + Shader = shader, + ImageFilter = blur + }) + canvas.DrawPaint(paint); + + using (var pseudoLight = SKShader.CreateRadialGradient( + lightPosition, + (float) (Bounds.Width/3), + new [] { + new SKColor(255, 200, 200, 100), + SKColors.Transparent, + new SKColor(40,40,40, 220), + new SKColor(20,20,20, (byte)Animate(100, 200,220)) }, + new float[] { 0.3f, 0.3f, 0.8f, 1 }, + SKShaderTileMode.Clamp)) + using (var paint = new SKPaint + { + Shader = pseudoLight + }) + canvas.DrawPaint(paint); + canvas.Restore(); + } + } + static int Animate(int d, int from, int to) + { + var ms = (int)(St.ElapsedMilliseconds / d); + var diff = to - from; + var range = diff * 2; + var v = ms % range; + if (v > diff) + v = range - v; + var rv = v + from; + if (rv < from || rv > to) + throw new Exception("WTF"); + return rv; + } + } + + + + public override void Render(DrawingContext context) + { + var noSkia = new FormattedText() + { + Text = "Current rendering API is not Skia" + }; + context.Custom(new CustomDrawOp(new Rect(0, 0, Bounds.Width, Bounds.Height), noSkia)); + Dispatcher.UIThread.InvokeAsync(InvalidateVisual, DispatcherPriority.Background); + } + } +} diff --git a/samples/VirtualizationDemo/Program.cs b/samples/VirtualizationDemo/Program.cs index 98f1f08d6c..9d8f7c1a3d 100644 --- a/samples/VirtualizationDemo/Program.cs +++ b/samples/VirtualizationDemo/Program.cs @@ -5,6 +5,7 @@ using System; using Avalonia; using Avalonia.Controls; using Avalonia.Logging.Serilog; +using Avalonia.ReactiveUI; using Serilog; namespace VirtualizationDemo diff --git a/src/Avalonia.Base/Utilities/WeakEventHandlerManager.cs b/src/Avalonia.Base/Utilities/WeakEventHandlerManager.cs index 0ade1af249..b59ed166bc 100644 --- a/src/Avalonia.Base/Utilities/WeakEventHandlerManager.cs +++ b/src/Avalonia.Base/Utilities/WeakEventHandlerManager.cs @@ -19,6 +19,7 @@ namespace Avalonia.Utilities /// /// The type of the target. /// The type of the event arguments. + /// The type of the subscriber. /// The event source. /// The name of the event. /// The subscriber. @@ -40,6 +41,7 @@ namespace Avalonia.Utilities /// Unsubscribes from an event. /// /// The type of the event arguments. + /// The type of the subscriber. /// The event source. /// The name of the event. /// The subscriber. diff --git a/src/Avalonia.Controls.DataGrid/Collections/DataGridCollectionView.cs b/src/Avalonia.Controls.DataGrid/Collections/DataGridCollectionView.cs index 4b4203ba40..92734b128d 100644 --- a/src/Avalonia.Controls.DataGrid/Collections/DataGridCollectionView.cs +++ b/src/Avalonia.Controls.DataGrid/Collections/DataGridCollectionView.cs @@ -927,7 +927,7 @@ namespace Avalonia.Collections /// ///

/// Clear a sort criteria by assigning SortDescription.Empty to this property. - /// One or more sort criteria in form of + /// One or more sort criteria in form of /// can be used, each specifying a property and direction to sort by. ///

/// @@ -4312,4 +4312,4 @@ namespace Avalonia.Collections } } } -} \ No newline at end of file +} diff --git a/src/Avalonia.Controls.DataGrid/Properties/AssemblyInfo.cs b/src/Avalonia.Controls.DataGrid/Properties/AssemblyInfo.cs index d5ad4c75f8..f15442addf 100644 --- a/src/Avalonia.Controls.DataGrid/Properties/AssemblyInfo.cs +++ b/src/Avalonia.Controls.DataGrid/Properties/AssemblyInfo.cs @@ -8,7 +8,6 @@ using Avalonia.Metadata; [assembly: InternalsVisibleTo("Avalonia.Controls.UnitTests")] [assembly: InternalsVisibleTo("Avalonia.DesignerSupport")] -[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia")] [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls")] -[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Primitives")] [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Collections")] +[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Primitives")] diff --git a/src/Avalonia.Controls/Button.cs b/src/Avalonia.Controls/Button.cs index 5ed0abf25d..cc9e6b7444 100644 --- a/src/Avalonia.Controls/Button.cs +++ b/src/Avalonia.Controls/Button.cs @@ -7,6 +7,7 @@ using System.Windows.Input; using Avalonia.Data; using Avalonia.Input; using Avalonia.Interactivity; +using Avalonia.LogicalTree; using Avalonia.VisualTree; namespace Avalonia.Controls @@ -160,6 +161,40 @@ namespace Avalonia.Controls } } + /// + protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e) + { + base.OnDetachedFromVisualTree(e); + + if (IsDefault) + { + if (e.Root is IInputElement inputElement) + { + StopListeningForDefault(inputElement); + } + } + } + + protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e) + { + base.OnAttachedToLogicalTree(e); + + if (Command != null) + { + Command.CanExecuteChanged += CanExecuteChanged; + } + } + + protected override void OnDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e) + { + base.OnDetachedFromLogicalTree(e); + + if (Command != null) + { + Command.CanExecuteChanged -= CanExecuteChanged; + } + } + /// protected override void OnKeyDown(KeyEventArgs e) { @@ -195,20 +230,6 @@ namespace Avalonia.Controls } } - /// - protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e) - { - base.OnDetachedFromVisualTree(e); - - if (IsDefault) - { - if (e.Root is IInputElement inputElement) - { - StopListeningForDefault(inputElement); - } - } - } - /// /// Invokes the event. /// @@ -281,17 +302,17 @@ namespace Avalonia.Controls { if (e.Sender is Button button) { - var oldCommand = e.OldValue as ICommand; - var newCommand = e.NewValue as ICommand; - - if (oldCommand != null) - { - oldCommand.CanExecuteChanged -= button.CanExecuteChanged; - } - - if (newCommand != null) + if (((ILogical)button).IsAttachedToLogicalTree) { - newCommand.CanExecuteChanged += button.CanExecuteChanged; + if (e.OldValue is ICommand oldCommand) + { + oldCommand.CanExecuteChanged -= button.CanExecuteChanged; + } + + if (e.NewValue is ICommand newCommand) + { + newCommand.CanExecuteChanged += button.CanExecuteChanged; + } } button.CanExecuteChanged(button, EventArgs.Empty); diff --git a/src/Avalonia.Controls/Grid.cs b/src/Avalonia.Controls/Grid.cs index b51583d8b3..90a27d0b31 100644 --- a/src/Avalonia.Controls/Grid.cs +++ b/src/Avalonia.Controls/Grid.cs @@ -177,6 +177,17 @@ namespace Avalonia.Controls return element.GetValue(RowSpanProperty); } + + /// + /// Gets the value of the IsSharedSizeScope attached property for a control. + /// + /// The control. + /// The control's IsSharedSizeScope value. + public static bool GetIsSharedSizeScope(AvaloniaObject element) + { + return element.GetValue(IsSharedSizeScopeProperty); + } + /// /// Sets the value of the Column attached property for a control. /// @@ -217,6 +228,16 @@ namespace Avalonia.Controls element.SetValue(RowSpanProperty, value); } + /// + /// Sets the value of IsSharedSizeScope property for a control. + /// + /// The control. + /// The IsSharedSizeScope value. + public static void SetIsSharedSizeScope(AvaloniaObject element, bool value) + { + element.SetValue(IsSharedSizeScopeProperty, value); + } + /// /// Gets the result of the last column measurement. /// Use this result to reduce the arrange calculation. diff --git a/src/Avalonia.Controls/ListBox.cs b/src/Avalonia.Controls/ListBox.cs index fce568e56d..041b81155a 100644 --- a/src/Avalonia.Controls/ListBox.cs +++ b/src/Avalonia.Controls/ListBox.cs @@ -30,13 +30,13 @@ namespace Avalonia.Controls /// /// Defines the property. /// - public static readonly new AvaloniaProperty SelectedItemsProperty = + public static readonly new DirectProperty SelectedItemsProperty = SelectingItemsControl.SelectedItemsProperty; /// /// Defines the property. /// - public static readonly new AvaloniaProperty SelectionModeProperty = + public static readonly new StyledProperty SelectionModeProperty = SelectingItemsControl.SelectionModeProperty; /// diff --git a/src/Avalonia.Controls/MenuItem.cs b/src/Avalonia.Controls/MenuItem.cs index 64daa133a3..d8473dc613 100644 --- a/src/Avalonia.Controls/MenuItem.cs +++ b/src/Avalonia.Controls/MenuItem.cs @@ -286,6 +286,26 @@ namespace Avalonia.Controls return new MenuItemContainerGenerator(this); } + protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e) + { + base.OnAttachedToLogicalTree(e); + + if (Command != null) + { + Command.CanExecuteChanged += CanExecuteChanged; + } + } + + protected override void OnDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e) + { + base.OnDetachedFromLogicalTree(e); + + if (Command != null) + { + Command.CanExecuteChanged -= CanExecuteChanged; + } + } + /// /// Called when the is clicked. /// @@ -399,14 +419,17 @@ namespace Avalonia.Controls { if (e.Sender is MenuItem menuItem) { - if (e.OldValue is ICommand oldCommand) + if (((ILogical)menuItem).IsAttachedToLogicalTree) { - oldCommand.CanExecuteChanged -= menuItem.CanExecuteChanged; - } + if (e.OldValue is ICommand oldCommand) + { + oldCommand.CanExecuteChanged -= menuItem.CanExecuteChanged; + } - if (e.NewValue is ICommand newCommand) - { - newCommand.CanExecuteChanged += menuItem.CanExecuteChanged; + if (e.NewValue is ICommand newCommand) + { + newCommand.CanExecuteChanged += menuItem.CanExecuteChanged; + } } menuItem.CanExecuteChanged(menuItem, EventArgs.Empty); diff --git a/src/Avalonia.Controls/Platform/InProcessDragSource.cs b/src/Avalonia.Controls/Platform/InProcessDragSource.cs index f8ae9f4249..0918da1a90 100644 --- a/src/Avalonia.Controls/Platform/InProcessDragSource.cs +++ b/src/Avalonia.Controls/Platform/InProcessDragSource.cs @@ -147,7 +147,10 @@ namespace Avalonia.Platform e.Handled = true; } else if (e.Key == Key.LeftCtrl || e.Key == Key.RightCtrl || e.Key == Key.LeftAlt || e.Key == Key.RightAlt) - RaiseEventAndUpdateCursor(RawDragEventType.DragOver, _lastRoot, _lastPosition, e.Modifiers); + { + if (_lastRoot != null) + RaiseEventAndUpdateCursor(RawDragEventType.DragOver, _lastRoot, _lastPosition, e.Modifiers); + } } private void ProcessMouseEvents(RawMouseEventArgs e) diff --git a/src/Avalonia.Controls/Primitives/PopupRoot.cs b/src/Avalonia.Controls/Primitives/PopupRoot.cs index 59a8933b4b..90020839d6 100644 --- a/src/Avalonia.Controls/Primitives/PopupRoot.cs +++ b/src/Avalonia.Controls/Primitives/PopupRoot.cs @@ -91,12 +91,12 @@ namespace Avalonia.Controls.Primitives if (screenX > screen.Bounds.Width) { - Position = Position.WithX(Position.X - screenX - bounds.Width); + Position = Position.WithX(Position.X - (screenX - screen.Bounds.Width)); } if (screenY > screen.Bounds.Height) { - Position = Position.WithY(Position.Y - screenY - bounds.Height); + Position = Position.WithY(Position.Y - (screenY - screen.Bounds.Height)); } } } diff --git a/src/Avalonia.Controls/Shapes/Shape.cs b/src/Avalonia.Controls/Shapes/Shape.cs index 57dbeba1cc..499dfb5320 100644 --- a/src/Avalonia.Controls/Shapes/Shape.cs +++ b/src/Avalonia.Controls/Shapes/Shape.cs @@ -21,13 +21,19 @@ namespace Avalonia.Controls.Shapes public static readonly StyledProperty> StrokeDashArrayProperty = AvaloniaProperty.Register>(nameof(StrokeDashArray)); - + public static readonly StyledProperty StrokeDashOffsetProperty = AvaloniaProperty.Register(nameof(StrokeDashOffset)); public static readonly StyledProperty StrokeThicknessProperty = AvaloniaProperty.Register(nameof(StrokeThickness)); + public static readonly StyledProperty StrokeLineCapProperty = + AvaloniaProperty.Register(nameof(StrokeLineCap), PenLineCap.Flat); + + public static readonly StyledProperty StrokeJoinProperty = + AvaloniaProperty.Register(nameof(StrokeJoin), PenLineJoin.Miter); + private Matrix _transform = Matrix.Identity; private Geometry _definingGeometry; private Geometry _renderedGeometry; @@ -36,7 +42,9 @@ namespace Avalonia.Controls.Shapes static Shape() { AffectsMeasure(StretchProperty, StrokeThicknessProperty); - AffectsRender(FillProperty, StrokeProperty, StrokeDashArrayProperty); + + AffectsRender(FillProperty, StrokeProperty, StrokeDashArrayProperty, StrokeDashOffsetProperty, + StrokeThicknessProperty, StrokeLineCapProperty, StrokeJoinProperty); } public Geometry DefiningGeometry @@ -106,7 +114,7 @@ namespace Avalonia.Controls.Shapes get { return GetValue(StrokeDashArrayProperty); } set { SetValue(StrokeDashArrayProperty, value); } } - + public double StrokeDashOffset { get { return GetValue(StrokeDashOffsetProperty); } @@ -119,13 +127,17 @@ namespace Avalonia.Controls.Shapes set { SetValue(StrokeThicknessProperty, value); } } - public PenLineCap StrokeDashCap { get; set; } = PenLineCap.Flat; - - public PenLineCap StrokeStartLineCap { get; set; } = PenLineCap.Flat; - - public PenLineCap StrokeEndLineCap { get; set; } = PenLineCap.Flat; + public PenLineCap StrokeLineCap + { + get { return GetValue(StrokeLineCapProperty); } + set { SetValue(StrokeLineCapProperty, value); } + } - public PenLineJoin StrokeJoin { get; set; } = PenLineJoin.Miter; + public PenLineJoin StrokeJoin + { + get { return GetValue(StrokeJoinProperty); } + set { SetValue(StrokeJoinProperty, value); } + } public override void Render(DrawingContext context) { @@ -133,8 +145,8 @@ namespace Avalonia.Controls.Shapes if (geometry != null) { - var pen = new Pen(Stroke, StrokeThickness, new DashStyle(StrokeDashArray, StrokeDashOffset), - StrokeDashCap, StrokeStartLineCap, StrokeEndLineCap, StrokeJoin); + var pen = new Pen(Stroke, StrokeThickness, new DashStyle(StrokeDashArray, StrokeDashOffset), + StrokeLineCap, StrokeJoin); context.DrawGeometry(Fill, pen, geometry); } } @@ -169,11 +181,11 @@ namespace Avalonia.Controls.Shapes protected void InvalidateGeometry() { - this._renderedGeometry = null; - this._definingGeometry = null; + _renderedGeometry = null; + _definingGeometry = null; InvalidateMeasure(); } - + protected override Size MeasureOverride(Size availableSize) { bool deferCalculateTransform; @@ -203,10 +215,10 @@ namespace Avalonia.Controls.Shapes return CalculateShapeSizeAndSetTransform(availableSize); } } - + protected override Size ArrangeOverride(Size finalSize) { - if(_calculateTransformOnArrange) + if (_calculateTransformOnArrange) { _calculateTransformOnArrange = false; CalculateShapeSizeAndSetTransform(finalSize); @@ -312,25 +324,25 @@ namespace Avalonia.Controls.Shapes private static void AffectsGeometryInvalidate(AvaloniaPropertyChangedEventArgs e) { - var control = e.Sender as Shape; + if (!(e.Sender is Shape control)) + { + return; + } - if (control != null) + // If the geometry is invalidated when Bounds changes, only invalidate when the Size + // portion changes. + if (e.Property == BoundsProperty) { - // If the geometry is invalidated when Bounds changes, only invalidate when the Size - // portion changes. - if (e.Property == BoundsProperty) - { - var oldBounds = (Rect)e.OldValue; - var newBounds = (Rect)e.NewValue; + var oldBounds = (Rect)e.OldValue; + var newBounds = (Rect)e.NewValue; - if (oldBounds.Size == newBounds.Size) - { - return; - } + if (oldBounds.Size == newBounds.Size) + { + return; } - - control.InvalidateGeometry(); } + + control.InvalidateGeometry(); } } } diff --git a/src/Avalonia.Controls/TreeView.cs b/src/Avalonia.Controls/TreeView.cs index 94989254dc..c3fbce1d83 100644 --- a/src/Avalonia.Controls/TreeView.cs +++ b/src/Avalonia.Controls/TreeView.cs @@ -40,17 +40,15 @@ namespace Avalonia.Controls /// Defines the property. /// public static readonly DirectProperty SelectedItemsProperty = - AvaloniaProperty.RegisterDirect( - nameof(SelectedItems), + ListBox.SelectedItemsProperty.AddOwner( o => o.SelectedItems, (o, v) => o.SelectedItems = v); /// /// Defines the property. /// - protected static readonly StyledProperty SelectionModeProperty = - AvaloniaProperty.Register( - nameof(SelectionMode)); + public static readonly StyledProperty SelectionModeProperty = + ListBox.SelectionModeProperty.AddOwner(); private static readonly IList Empty = new object[0]; private object _selectedItem; diff --git a/src/Avalonia.Controls/Window.cs b/src/Avalonia.Controls/Window.cs index f5af6774b5..e40e114769 100644 --- a/src/Avalonia.Controls/Window.cs +++ b/src/Avalonia.Controls/Window.cs @@ -291,7 +291,8 @@ namespace Avalonia.Controls /// /// The dialog result. /// - /// When the window is shown with the method, the + /// When the window is shown with the + /// or method, the /// resulting task will produce the value when the window /// is closed. /// @@ -370,8 +371,16 @@ namespace Avalonia.Controls /// /// Shows the window. /// + /// + /// The window has already been closed. + /// public override void Show() { + if (PlatformImpl == null) + { + throw new InvalidOperationException("Cannot re-show a closed window."); + } + if (IsVisible) { return; @@ -396,6 +405,9 @@ namespace Avalonia.Controls /// Shows the window as a dialog. /// /// The dialog's owner window. + /// + /// The window has already been closed. + /// /// /// A task that can be used to track the lifetime of the dialog. /// diff --git a/src/Avalonia.ReactiveUI/AppBuilderExtensions.cs b/src/Avalonia.ReactiveUI/AppBuilderExtensions.cs index d763febdf3..f67cb7f40a 100644 --- a/src/Avalonia.ReactiveUI/AppBuilderExtensions.cs +++ b/src/Avalonia.ReactiveUI/AppBuilderExtensions.cs @@ -6,10 +6,15 @@ using Avalonia.Threading; using ReactiveUI; using Splat; -namespace Avalonia +namespace Avalonia.ReactiveUI { public static class AppBuilderExtensions { + /// + /// Initializes ReactiveUI framework to use with Avalonia. Registers Avalonia + /// scheduler and Avalonia activation for view fetcher. Always remember to + /// call this method if you are using ReactiveUI in your application. + /// public static TAppBuilder UseReactiveUI(this TAppBuilder builder) where TAppBuilder : AppBuilderBase, new() { diff --git a/src/Avalonia.ReactiveUI/Attributes.cs b/src/Avalonia.ReactiveUI/Attributes.cs new file mode 100644 index 0000000000..e908d1de80 --- /dev/null +++ b/src/Avalonia.ReactiveUI/Attributes.cs @@ -0,0 +1,8 @@ +// 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.Reflection; +using System.Runtime.CompilerServices; +using Avalonia.Metadata; + +[assembly: XmlnsDefinition("http://reactiveui.net", "Avalonia.ReactiveUI")] \ No newline at end of file diff --git a/src/Avalonia.ReactiveUI/AvaloniaActivationForViewFetcher.cs b/src/Avalonia.ReactiveUI/AvaloniaActivationForViewFetcher.cs index e1db604e95..cfa7a270be 100644 --- a/src/Avalonia.ReactiveUI/AvaloniaActivationForViewFetcher.cs +++ b/src/Avalonia.ReactiveUI/AvaloniaActivationForViewFetcher.cs @@ -9,15 +9,24 @@ using Avalonia.VisualTree; using Avalonia.Controls; using ReactiveUI; -namespace Avalonia +namespace Avalonia.ReactiveUI { + /// + /// Determines when Avalonia IVisuals get activated. + /// public class AvaloniaActivationForViewFetcher : IActivationForViewFetcher { + /// + /// Returns affinity for view. + /// public int GetAffinityForView(Type view) { return typeof(IVisual).GetTypeInfo().IsAssignableFrom(view.GetTypeInfo()) ? 10 : 0; } + /// + /// Returns activation observable for activatable Avalonia view. + /// public IObservable GetActivationForView(IActivatable view) { if (!(view is IVisual visual)) return Observable.Return(false); @@ -25,6 +34,9 @@ namespace Avalonia return GetActivationForVisual(visual); } + /// + /// Listens to Opened and Closed events for Avalonia windows. + /// private IObservable GetActivationForWindowBase(WindowBase window) { var windowLoaded = Observable @@ -42,6 +54,10 @@ namespace Avalonia .DistinctUntilChanged(); } + /// + /// Listens to AttachedToVisualTree and DetachedFromVisualTree + /// events for Avalonia IVisuals. + /// private IObservable GetActivationForVisual(IVisual visual) { var visualLoaded = Observable diff --git a/src/Avalonia.ReactiveUI/ReactiveUserControl.cs b/src/Avalonia.ReactiveUI/ReactiveUserControl.cs index 43e2ef93b6..010acc3ae0 100644 --- a/src/Avalonia.ReactiveUI/ReactiveUserControl.cs +++ b/src/Avalonia.ReactiveUI/ReactiveUserControl.cs @@ -6,7 +6,7 @@ using Avalonia.VisualTree; using Avalonia.Controls; using ReactiveUI; -namespace Avalonia +namespace Avalonia.ReactiveUI { /// /// A ReactiveUI UserControl that implements diff --git a/src/Avalonia.ReactiveUI/ReactiveWindow.cs b/src/Avalonia.ReactiveUI/ReactiveWindow.cs index bb50a37764..f0f115afbc 100644 --- a/src/Avalonia.ReactiveUI/ReactiveWindow.cs +++ b/src/Avalonia.ReactiveUI/ReactiveWindow.cs @@ -6,7 +6,7 @@ using Avalonia.VisualTree; using Avalonia.Controls; using ReactiveUI; -namespace Avalonia +namespace Avalonia.ReactiveUI { /// /// A ReactiveUI Window that implements diff --git a/src/Avalonia.ReactiveUI/RoutedViewHost.cs b/src/Avalonia.ReactiveUI/RoutedViewHost.cs index e364d5de0b..4bd86a67c0 100644 --- a/src/Avalonia.ReactiveUI/RoutedViewHost.cs +++ b/src/Avalonia.ReactiveUI/RoutedViewHost.cs @@ -1,13 +1,17 @@ +// 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.Disposables; using System.Reactive.Linq; using Avalonia.Animation; using Avalonia.Controls; using Avalonia.Styling; +using Avalonia; using ReactiveUI; using Splat; -namespace Avalonia +namespace Avalonia.ReactiveUI { /// /// This control hosts the View associated with ReactiveUI RoutingState, @@ -157,7 +161,7 @@ namespace Avalonia return; } - var viewLocator = ViewLocator ?? ReactiveUI.ViewLocator.Current; + var viewLocator = ViewLocator ?? global::ReactiveUI.ViewLocator.Current; var view = viewLocator.ResolveView(viewModel); if (view == null) throw new Exception($"Couldn't find view for '{viewModel}'. Is it registered?"); diff --git a/src/Avalonia.Styling/StyledElement.cs b/src/Avalonia.Styling/StyledElement.cs index e52a1961ba..d314a8d44e 100644 --- a/src/Avalonia.Styling/StyledElement.cs +++ b/src/Avalonia.Styling/StyledElement.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Collections.Specialized; +using System.ComponentModel; using System.Linq; using System.Reactive.Linq; using System.Reactive.Subjects; diff --git a/src/Avalonia.Themes.Default/ScrollBar.xaml b/src/Avalonia.Themes.Default/ScrollBar.xaml index 2cb8ce2d24..ca308b33c3 100644 --- a/src/Avalonia.Themes.Default/ScrollBar.xaml +++ b/src/Avalonia.Themes.Default/ScrollBar.xaml @@ -30,13 +30,7 @@ Classes="repeattrack" Focusable="False"/> - - - - - - - + - - - - - - - + + diff --git a/src/Avalonia.Visuals/Media/BrushExtensions.cs b/src/Avalonia.Visuals/Media/BrushExtensions.cs index cd351071dd..522953eb04 100644 --- a/src/Avalonia.Visuals/Media/BrushExtensions.cs +++ b/src/Avalonia.Visuals/Media/BrushExtensions.cs @@ -34,16 +34,14 @@ namespace Avalonia.Media { Contract.Requires(pen != null); - var brush = pen?.Brush?.ToImmutable(); - return pen == null || ReferenceEquals(pen?.Brush, brush) ? + var brush = pen.Brush?.ToImmutable(); + return ReferenceEquals(pen.Brush, brush) ? pen : new Pen( brush, thickness: pen.Thickness, - dashStyle: pen.DashStyle, - dashCap: pen.DashCap, - startLineCap: pen.StartLineCap, - endLineCap: pen.EndLineCap, + dashStyle: pen.DashStyle, + lineCap: pen.LineCap, lineJoin: pen.LineJoin, miterLimit: pen.MiterLimit); } diff --git a/src/Avalonia.Visuals/Media/DrawingContext.cs b/src/Avalonia.Visuals/Media/DrawingContext.cs index fd593db991..d3af71ffcb 100644 --- a/src/Avalonia.Visuals/Media/DrawingContext.cs +++ b/src/Avalonia.Visuals/Media/DrawingContext.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using Avalonia.Media.Imaging; using Avalonia.Platform; +using Avalonia.Rendering.SceneGraph; using Avalonia.Threading; using Avalonia.Visuals.Media.Imaging; @@ -131,6 +132,12 @@ namespace Avalonia.Media } } + /// + /// Draws a custom drawing operation + /// + /// custom operation + public void Custom(ICustomDrawOperation custom) => PlatformImpl.Custom(custom); + /// /// Draws text. /// diff --git a/src/Avalonia.Visuals/Media/EllipseGeometry.cs b/src/Avalonia.Visuals/Media/EllipseGeometry.cs index ca84d4cc7b..c2df9db635 100644 --- a/src/Avalonia.Visuals/Media/EllipseGeometry.cs +++ b/src/Avalonia.Visuals/Media/EllipseGeometry.cs @@ -1,7 +1,6 @@ // 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 Avalonia.Platform; namespace Avalonia.Media @@ -57,36 +56,8 @@ namespace Avalonia.Media protected override IGeometryImpl CreateDefiningGeometry() { var factory = AvaloniaLocator.Current.GetService(); - var geometry = factory.CreateStreamGeometry(); - using (var ctx = geometry.Open()) - { - var rect = Rect; - double controlPointRatio = (Math.Sqrt(2) - 1) * 4 / 3; - var center = rect.Center; - var radius = new Vector(rect.Width / 2, rect.Height / 2); - - var x0 = center.X - radius.X; - var x1 = center.X - (radius.X * controlPointRatio); - var x2 = center.X; - var x3 = center.X + (radius.X * controlPointRatio); - var x4 = center.X + radius.X; - - var y0 = center.Y - radius.Y; - var y1 = center.Y - (radius.Y * controlPointRatio); - var y2 = center.Y; - var y3 = center.Y + (radius.Y * controlPointRatio); - var y4 = center.Y + radius.Y; - - ctx.BeginFigure(new Point(x2, y0), true); - ctx.CubicBezierTo(new Point(x3, y0), new Point(x4, y1), new Point(x4, y2)); - ctx.CubicBezierTo(new Point(x4, y3), new Point(x3, y4), new Point(x2, y4)); - ctx.CubicBezierTo(new Point(x1, y4), new Point(x0, y3), new Point(x0, y2)); - ctx.CubicBezierTo(new Point(x0, y1), new Point(x1, y0), new Point(x2, y0)); - ctx.EndFigure(true); - } - - return geometry; + return factory.CreateEllipseGeometry(Rect); } } } diff --git a/src/Avalonia.Visuals/Media/LineGeometry.cs b/src/Avalonia.Visuals/Media/LineGeometry.cs index f7ba4ccb0e..90577dabd8 100644 --- a/src/Avalonia.Visuals/Media/LineGeometry.cs +++ b/src/Avalonia.Visuals/Media/LineGeometry.cs @@ -73,16 +73,8 @@ namespace Avalonia.Media protected override IGeometryImpl CreateDefiningGeometry() { var factory = AvaloniaLocator.Current.GetService(); - var geometry = factory.CreateStreamGeometry(); - using (var context = geometry.Open()) - { - context.BeginFigure(StartPoint, false); - context.LineTo(EndPoint); - context.EndFigure(false); - } - - return geometry; + return factory.CreateLineGeometry(StartPoint, EndPoint); } } } diff --git a/src/Avalonia.Visuals/Media/Pen.cs b/src/Avalonia.Visuals/Media/Pen.cs index ddd8091801..ee427c913b 100644 --- a/src/Avalonia.Visuals/Media/Pen.cs +++ b/src/Avalonia.Visuals/Media/Pen.cs @@ -11,63 +11,45 @@ namespace Avalonia.Media /// /// Initializes a new instance of the class. /// - /// The brush used to draw. + /// The stroke color. /// The stroke thickness. /// The dash style. - /// The dash cap. - /// The start line cap. - /// The end line cap. + /// Specifies the type of graphic shape to use on both ends of a line. /// The line join. /// The miter limit. public Pen( - IBrush brush, + uint color, double thickness = 1.0, - DashStyle dashStyle = null, - PenLineCap dashCap = PenLineCap.Flat, - PenLineCap startLineCap = PenLineCap.Flat, - PenLineCap endLineCap = PenLineCap.Flat, - PenLineJoin lineJoin = PenLineJoin.Miter, - double miterLimit = 10.0) + DashStyle dashStyle = null, + PenLineCap lineCap = PenLineCap.Flat, + PenLineJoin lineJoin = PenLineJoin.Miter, + double miterLimit = 10.0) : this(new SolidColorBrush(color), thickness, dashStyle, lineCap, lineJoin, miterLimit) { - Brush = brush; - Thickness = thickness; - DashCap = dashCap; - StartLineCap = startLineCap; - EndLineCap = endLineCap; - LineJoin = lineJoin; - MiterLimit = miterLimit; - DashStyle = dashStyle; } /// /// Initializes a new instance of the class. /// - /// The stroke color. + /// The brush used to draw. /// The stroke thickness. /// The dash style. - /// The dash cap. - /// The start line cap. - /// The end line cap. + /// The line cap. /// The line join. /// The miter limit. public Pen( - uint color, + IBrush brush, double thickness = 1.0, - DashStyle dashStyle = null, - PenLineCap dashCap = PenLineCap.Flat, - PenLineCap startLineCap = PenLineCap.Flat, - PenLineCap endLineCap = PenLineCap.Flat, - PenLineJoin lineJoin = PenLineJoin.Miter, + DashStyle dashStyle = null, + PenLineCap lineCap = PenLineCap.Flat, + PenLineJoin lineJoin = PenLineJoin.Miter, double miterLimit = 10.0) { - Brush = new SolidColorBrush(color); + Brush = brush; Thickness = thickness; - StartLineCap = startLineCap; - EndLineCap = endLineCap; + LineCap = lineCap; LineJoin = lineJoin; MiterLimit = miterLimit; DashStyle = dashStyle; - DashCap = dashCap; } /// @@ -78,18 +60,26 @@ namespace Avalonia.Media /// /// Gets the stroke thickness. /// - public double Thickness { get; } = 1.0; + public double Thickness { get; } + /// + /// Specifies the style of dashed lines drawn with a object. + /// public DashStyle DashStyle { get; } - public PenLineCap DashCap { get; } - - public PenLineCap StartLineCap { get; } = PenLineCap.Flat; - - public PenLineCap EndLineCap { get; } = PenLineCap.Flat; + /// + /// Specifies the type of graphic shape to use on both ends of a line. + /// + public PenLineCap LineCap { get; } - public PenLineJoin LineJoin { get; } = PenLineJoin.Miter; + /// + /// Specifies how to join consecutive line or curve segments in a (subpath) contained in a object. + /// + public PenLineJoin LineJoin { get; } - public double MiterLimit { get; } = 10.0; + /// + /// The limit on the ratio of the miter length to half this pen's Thickness. + /// + public double MiterLimit { get; } } } diff --git a/src/Avalonia.Visuals/Media/PenLineCap.cs b/src/Avalonia.Visuals/Media/PenLineCap.cs index 56c5c040eb..83d8f11613 100644 --- a/src/Avalonia.Visuals/Media/PenLineCap.cs +++ b/src/Avalonia.Visuals/Media/PenLineCap.cs @@ -4,7 +4,6 @@ namespace Avalonia.Media { Flat, Round, - Square, - Triangle + Square } } diff --git a/src/Avalonia.Visuals/Media/RectangleGeometry.cs b/src/Avalonia.Visuals/Media/RectangleGeometry.cs index 3ccfd80f93..9250500644 100644 --- a/src/Avalonia.Visuals/Media/RectangleGeometry.cs +++ b/src/Avalonia.Visuals/Media/RectangleGeometry.cs @@ -16,12 +16,6 @@ namespace Avalonia.Media public static readonly StyledProperty RectProperty = AvaloniaProperty.Register(nameof(Rect)); - public Rect Rect - { - get => GetValue(RectProperty); - set => SetValue(RectProperty, value); - } - static RectangleGeometry() { AffectsGeometry(RectProperty); @@ -43,25 +37,23 @@ namespace Avalonia.Media Rect = rect; } + /// + /// Gets or sets the bounds of the rectangle. + /// + public Rect Rect + { + get => GetValue(RectProperty); + set => SetValue(RectProperty, value); + } + /// public override Geometry Clone() => new RectangleGeometry(Rect); protected override IGeometryImpl CreateDefiningGeometry() { var factory = AvaloniaLocator.Current.GetService(); - var geometry = factory.CreateStreamGeometry(); - - using (var context = geometry.Open()) - { - var rect = Rect; - context.BeginFigure(rect.TopLeft, true); - context.LineTo(rect.TopRight); - context.LineTo(rect.BottomRight); - context.LineTo(rect.BottomLeft); - context.EndFigure(true); - } - return geometry; + return factory.CreateRectangleGeometry(Rect); } } } diff --git a/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs b/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs index 57b974f900..e5be04ebf9 100644 --- a/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs +++ b/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs @@ -3,6 +3,7 @@ using System; using Avalonia.Media; +using Avalonia.Rendering.SceneGraph; using Avalonia.Utilities; using Avalonia.Visuals.Media.Imaging; @@ -139,5 +140,11 @@ namespace Avalonia.Platform /// Pops the latest pushed geometry clip. /// void PopGeometryClip(); + + /// + /// Adds a custom draw operation + /// + /// Custom draw operation + void Custom(ICustomDrawOperation custom); } } diff --git a/src/Avalonia.Visuals/Platform/IPlatformRenderInterface.cs b/src/Avalonia.Visuals/Platform/IPlatformRenderInterface.cs index 3a1f79e32a..87db9251e1 100644 --- a/src/Avalonia.Visuals/Platform/IPlatformRenderInterface.cs +++ b/src/Avalonia.Visuals/Platform/IPlatformRenderInterface.cs @@ -36,6 +36,28 @@ namespace Avalonia.Platform Size constraint, IReadOnlyList spans); + /// + /// Creates an ellipse geometry implementation. + /// + /// The bounds of the ellipse. + /// An ellipse geometry.. + IGeometryImpl CreateEllipseGeometry(Rect rect); + + /// + /// Creates a line geometry implementation. + /// + /// The start of the line. + /// The end of the line. + /// A line geometry. + IGeometryImpl CreateLineGeometry(Point p1, Point p2); + + /// + /// Creates a rectangle geometry implementation. + /// + /// The bounds of the rectangle. + /// A rectangle. + IGeometryImpl CreateRectangleGeometry(Rect rect); + /// /// Creates a stream geometry implementation. /// diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/CustomDrawOperation.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/CustomDrawOperation.cs new file mode 100644 index 0000000000..68e2237430 --- /dev/null +++ b/src/Avalonia.Visuals/Rendering/SceneGraph/CustomDrawOperation.cs @@ -0,0 +1,39 @@ +using System; +using Avalonia.Media; +using Avalonia.Platform; + +namespace Avalonia.Rendering.SceneGraph +{ + internal sealed class CustomDrawOperation : DrawOperation + { + public Matrix Transform { get; } + public ICustomDrawOperation Custom { get; } + public CustomDrawOperation(ICustomDrawOperation custom, Matrix transform) + : base(custom.Bounds, transform, null) + { + Transform = transform; + Custom = custom; + } + + public override bool HitTest(Point p) + { + return Custom.HitTest(p * Transform); + } + + public override void Render(IDrawingContextImpl context) + { + context.Transform = Transform; + Custom.Render(context); + } + + public override void Dispose() => Custom.Dispose(); + + public bool Equals(Matrix transform, ICustomDrawOperation custom) => + Transform == transform && Custom?.Equals(custom) == true; + } + + public interface ICustomDrawOperation : IDrawOperation, IEquatable + { + + } +} diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs index dfed0d911c..0b33851911 100644 --- a/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs +++ b/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs @@ -165,6 +165,15 @@ namespace Avalonia.Rendering.SceneGraph ++_drawOperationindex; } } + + public void Custom(ICustomDrawOperation custom) + { + var next = NextDrawAs(); + if (next == null || !next.Item.Equals(Transform, custom)) + Add(new CustomDrawOperation(custom, Transform)); + else + ++_drawOperationindex; + } /// public void DrawText(IBrush foreground, Point origin, IFormattedTextImpl text) diff --git a/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoader.cs b/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoader.cs index a1f8bf6cf6..4c352f199f 100644 --- a/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoader.cs +++ b/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoader.cs @@ -162,7 +162,8 @@ namespace Avalonia.Markup.Xaml var readerSettings = new XamlXmlReaderSettings() { BaseUri = uri, - LocalAssembly = localAssembly + LocalAssembly = localAssembly, + ProvideLineInfo = true, }; var context = IsDesignMode ? AvaloniaXamlSchemaContext.DesignInstance : AvaloniaXamlSchemaContext.Instance; diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github index ab55261737..7452b23169 160000 --- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github +++ b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github @@ -1 +1 @@ -Subproject commit ab5526173722b8988bc5ca3c03c8752ce89c0975 +Subproject commit 7452b23169e4948907fa10e2c115b672897d0e04 diff --git a/src/Skia/Avalonia.Skia/CustomRenderTarget.cs b/src/Skia/Avalonia.Skia/CustomRenderTarget.cs new file mode 100644 index 0000000000..23a509a2a4 --- /dev/null +++ b/src/Skia/Avalonia.Skia/CustomRenderTarget.cs @@ -0,0 +1,42 @@ +// 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 Avalonia.Platform; +using Avalonia.Rendering; + +namespace Avalonia.Skia +{ + /// + /// Adapts to be used within Skia rendering pipeline. + /// + internal class CustomRenderTarget : IRenderTarget + { + private readonly ICustomSkiaRenderTarget _renderTarget; + + public CustomRenderTarget(ICustomSkiaRenderTarget renderTarget) + { + _renderTarget = renderTarget; + } + + public void Dispose() + { + _renderTarget.Dispose(); + } + + public IDrawingContextImpl CreateDrawingContext(IVisualBrushRenderer visualBrushRenderer) + { + ICustomSkiaRenderSession session = _renderTarget.BeginRendering(); + + var nfo = new DrawingContextImpl.CreateInfo + { + GrContext = session.GrContext, + Canvas = session.Canvas, + Dpi = SkiaPlatform.DefaultDpi * session.ScaleFactor, + VisualBrushRenderer = visualBrushRenderer, + DisableTextLcdRendering = true + }; + + return new DrawingContextImpl(nfo, session); + } + } +} diff --git a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs index e69d155305..ee4564ff35 100644 --- a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs +++ b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs @@ -9,6 +9,7 @@ using System.Threading; using Avalonia.Media; using Avalonia.Platform; using Avalonia.Rendering; +using Avalonia.Rendering.SceneGraph; using Avalonia.Rendering.Utilities; using Avalonia.Utilities; using Avalonia.Visuals.Media.Imaging; @@ -19,7 +20,7 @@ namespace Avalonia.Skia /// /// Skia based drawing context. /// - public class DrawingContextImpl : IDrawingContextImpl + internal class DrawingContextImpl : IDrawingContextImpl, ISkiaDrawingContextImpl { private IDisposable[] _disposables; private readonly Vector _dpi; @@ -99,6 +100,8 @@ namespace Avalonia.Skia /// public SKCanvas Canvas { get; } + SKCanvas ISkiaDrawingContextImpl.SkCanvas => Canvas; + /// public void Clear(Color color) { @@ -296,6 +299,8 @@ namespace Avalonia.Skia Canvas.Restore(); } + public void Custom(ICustomDrawOperation custom) => custom.Render(this); + /// public void PushOpacityMask(IBrush mask, Rect bounds) { @@ -573,25 +578,17 @@ namespace Avalonia.Skia // Need to modify dashes due to Skia modifying their lengths // https://docs.microsoft.com/en-us/xamarin/xamarin-forms/user-interface/graphics/skiasharp/paths/dots // TODO: Still something is off, dashes are now present, but don't look the same as D2D ones. - float dashLengthModifier; - float gapLengthModifier; - switch (pen.StartLineCap) + switch (pen.LineCap) { case PenLineCap.Round: paint.StrokeCap = SKStrokeCap.Round; - dashLengthModifier = -paint.StrokeWidth; - gapLengthModifier = paint.StrokeWidth; break; case PenLineCap.Square: paint.StrokeCap = SKStrokeCap.Square; - dashLengthModifier = -paint.StrokeWidth; - gapLengthModifier = paint.StrokeWidth; break; default: paint.StrokeCap = SKStrokeCap.Butt; - dashLengthModifier = 0.0f; - gapLengthModifier = 0.0f; break; } @@ -617,13 +614,12 @@ namespace Avalonia.Skia for (var i = 0; i < srcDashes.Count; ++i) { - var lengthModifier = i % 2 == 0 ? dashLengthModifier : gapLengthModifier; - - // Avalonia dash lengths are relative, but Skia takes absolute sizes - need to scale - dashesArray[i] = (float) srcDashes[i] * paint.StrokeWidth + lengthModifier; + dashesArray[i] = (float) srcDashes[i] * paint.StrokeWidth; } - var pe = SKPathEffect.CreateDash(dashesArray, (float) pen.DashStyle.Offset); + var offset = (float)(pen.DashStyle.Offset * pen.Thickness); + + var pe = SKPathEffect.CreateDash(dashesArray, offset); paint.PathEffect = pe; rv.AddDisposable(pe); diff --git a/src/Skia/Avalonia.Skia/EllipseGeometryImpl.cs b/src/Skia/Avalonia.Skia/EllipseGeometryImpl.cs new file mode 100644 index 0000000000..aae1dd8cef --- /dev/null +++ b/src/Skia/Avalonia.Skia/EllipseGeometryImpl.cs @@ -0,0 +1,25 @@ +// 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 SkiaSharp; + +namespace Avalonia.Skia +{ + /// + /// A Skia implementation of a . + /// + internal class EllipseGeometryImpl : GeometryImpl + { + public override Rect Bounds { get; } + public override SKPath EffectivePath { get; } + + public EllipseGeometryImpl(Rect rect) + { + var path = new SKPath(); + path.AddOval(rect.ToSKRect()); + + EffectivePath = path; + Bounds = rect; + } + } +} diff --git a/src/Skia/Avalonia.Skia/FormattedTextImpl.cs b/src/Skia/Avalonia.Skia/FormattedTextImpl.cs index c83d5f26fb..b701e60660 100644 --- a/src/Skia/Avalonia.Skia/FormattedTextImpl.cs +++ b/src/Skia/Avalonia.Skia/FormattedTextImpl.cs @@ -13,7 +13,7 @@ namespace Avalonia.Skia /// /// Skia formatted text implementation. /// - public class FormattedTextImpl : IFormattedTextImpl + internal class FormattedTextImpl : IFormattedTextImpl { public FormattedTextImpl( string text, diff --git a/src/Skia/Avalonia.Skia/FramebufferRenderTarget.cs b/src/Skia/Avalonia.Skia/FramebufferRenderTarget.cs index 0cb4c3db67..1af3d2968c 100644 --- a/src/Skia/Avalonia.Skia/FramebufferRenderTarget.cs +++ b/src/Skia/Avalonia.Skia/FramebufferRenderTarget.cs @@ -13,7 +13,7 @@ namespace Avalonia.Skia /// /// Skia render target that renders to a framebuffer surface. No gpu acceleration available. /// - public class FramebufferRenderTarget : IRenderTarget + internal class FramebufferRenderTarget : IRenderTarget { private readonly IFramebufferPlatformSurface _platformSurface; private SKImageInfo _currentImageInfo; diff --git a/src/Skia/Avalonia.Skia/GeometryImpl.cs b/src/Skia/Avalonia.Skia/GeometryImpl.cs index fbbd6eb58c..5940de418e 100644 --- a/src/Skia/Avalonia.Skia/GeometryImpl.cs +++ b/src/Skia/Avalonia.Skia/GeometryImpl.cs @@ -11,7 +11,7 @@ namespace Avalonia.Skia /// /// A Skia implementation of . /// - public abstract class GeometryImpl : IGeometryImpl + internal abstract class GeometryImpl : IGeometryImpl { private PathCache _pathCache; diff --git a/src/Skia/Avalonia.Skia/GlRenderTarget.cs b/src/Skia/Avalonia.Skia/GlRenderTarget.cs index cd8c334b53..7c0c42ca37 100644 --- a/src/Skia/Avalonia.Skia/GlRenderTarget.cs +++ b/src/Skia/Avalonia.Skia/GlRenderTarget.cs @@ -8,7 +8,7 @@ using static Avalonia.OpenGL.GlConsts; namespace Avalonia.Skia { - public class GlRenderTarget : IRenderTarget + internal class GlRenderTarget : IRenderTarget { private readonly GRContext _grContext; private IGlPlatformSurfaceRenderTarget _surface; diff --git a/src/Skia/Avalonia.Skia/ICustomSkiaGpu.cs b/src/Skia/Avalonia.Skia/ICustomSkiaGpu.cs new file mode 100644 index 0000000000..751dd3c1e7 --- /dev/null +++ b/src/Skia/Avalonia.Skia/ICustomSkiaGpu.cs @@ -0,0 +1,26 @@ +// 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.Collections.Generic; +using SkiaSharp; + +namespace Avalonia.Skia +{ + /// + /// Custom Skia gpu instance. + /// + public interface ICustomSkiaGpu + { + /// + /// Skia GrContext used. + /// + GRContext GrContext { get; } + + /// + /// Attempts to create custom render target from given surfaces. + /// + /// Surfaces. + /// Created render target or if it fails. + ICustomSkiaRenderTarget TryCreateRenderTarget(IEnumerable surfaces); + } +} diff --git a/src/Skia/Avalonia.Skia/ICustomSkiaRenderSession.cs b/src/Skia/Avalonia.Skia/ICustomSkiaRenderSession.cs new file mode 100644 index 0000000000..6a4591921e --- /dev/null +++ b/src/Skia/Avalonia.Skia/ICustomSkiaRenderSession.cs @@ -0,0 +1,29 @@ +// 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 SkiaSharp; + +namespace Avalonia.Skia +{ + /// + /// Custom render session for Skia render target. + /// + public interface ICustomSkiaRenderSession : IDisposable + { + /// + /// GrContext used by this session. + /// + GRContext GrContext { get; } + + /// + /// Canvas that will be used to render. + /// + SKCanvas Canvas { get; } + + /// + /// Scaling factor. + /// + double ScaleFactor { get; } + } +} diff --git a/src/Skia/Avalonia.Skia/ICustomSkiaRenderTarget.cs b/src/Skia/Avalonia.Skia/ICustomSkiaRenderTarget.cs new file mode 100644 index 0000000000..f67b28b77b --- /dev/null +++ b/src/Skia/Avalonia.Skia/ICustomSkiaRenderTarget.cs @@ -0,0 +1,19 @@ +// 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; + +namespace Avalonia.Skia +{ + /// + /// Custom Skia render target. + /// + public interface ICustomSkiaRenderTarget : IDisposable + { + /// + /// Start rendering to this render target. + /// + /// + ICustomSkiaRenderSession BeginRendering(); + } +} diff --git a/src/Skia/Avalonia.Skia/ISkiaDrawingContextImpl.cs b/src/Skia/Avalonia.Skia/ISkiaDrawingContextImpl.cs new file mode 100644 index 0000000000..ff82990c47 --- /dev/null +++ b/src/Skia/Avalonia.Skia/ISkiaDrawingContextImpl.cs @@ -0,0 +1,10 @@ +using Avalonia.Platform; +using SkiaSharp; + +namespace Avalonia.Skia +{ + public interface ISkiaDrawingContextImpl : IDrawingContextImpl + { + SKCanvas SkCanvas { get; } + } +} diff --git a/src/Skia/Avalonia.Skia/ImmutableBitmap.cs b/src/Skia/Avalonia.Skia/ImmutableBitmap.cs index 49992df395..f283040eac 100644 --- a/src/Skia/Avalonia.Skia/ImmutableBitmap.cs +++ b/src/Skia/Avalonia.Skia/ImmutableBitmap.cs @@ -12,7 +12,7 @@ namespace Avalonia.Skia /// /// Immutable Skia bitmap. /// - public class ImmutableBitmap : IDrawableBitmapImpl + internal class ImmutableBitmap : IDrawableBitmapImpl { private readonly SKImage _image; diff --git a/src/Skia/Avalonia.Skia/LineGeometryImpl.cs b/src/Skia/Avalonia.Skia/LineGeometryImpl.cs new file mode 100644 index 0000000000..e929e153d1 --- /dev/null +++ b/src/Skia/Avalonia.Skia/LineGeometryImpl.cs @@ -0,0 +1,29 @@ +// 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 SkiaSharp; + +namespace Avalonia.Skia +{ + /// + /// A Skia implementation of a . + /// + internal class LineGeometryImpl : GeometryImpl + { + public override Rect Bounds { get; } + public override SKPath EffectivePath { get; } + + public LineGeometryImpl(Point p1, Point p2) + { + var path = new SKPath(); + path.MoveTo(p1.ToSKPoint()); + path.LineTo(p2.ToSKPoint()); + + EffectivePath = path; + Bounds = new Rect( + new Point(Math.Min(p1.X, p2.X), Math.Min(p1.Y, p2.Y)), + new Point(Math.Max(p1.X, p2.X), Math.Max(p1.Y, p2.Y))); + } + } +} diff --git a/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs b/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs index c6e68b1c8b..362fd028cf 100644 --- a/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs +++ b/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs @@ -15,14 +15,25 @@ namespace Avalonia.Skia /// /// Skia platform render interface. /// - public class PlatformRenderInterface : IPlatformRenderInterface + internal class PlatformRenderInterface : IPlatformRenderInterface { + private readonly ICustomSkiaGpu _customSkiaGpu; + private GRContext GrContext { get; } public IEnumerable InstalledFontNames => SKFontManager.Default.FontFamilies; - public PlatformRenderInterface() + public PlatformRenderInterface(ICustomSkiaGpu customSkiaGpu) { + if (customSkiaGpu != null) + { + _customSkiaGpu = customSkiaGpu; + + GrContext = _customSkiaGpu.GrContext; + + return; + } + var gl = AvaloniaLocator.Current.GetService(); if (gl != null) { @@ -32,12 +43,11 @@ namespace Avalonia.Skia ? GRGlInterface.AssembleGlInterface((_, proc) => display.GlInterface.GetProcAddress(proc)) : GRGlInterface.AssembleGlesInterface((_, proc) => display.GlInterface.GetProcAddress(proc))) { - GrContext = GRContext.Create(GRBackend.OpenGL, iface); } } } - + /// public IFormattedTextImpl CreateFormattedText( string text, @@ -50,6 +60,12 @@ namespace Avalonia.Skia return new FormattedTextImpl(text, typeface, textAlignment, wrapping, constraint, spans); } + public IGeometryImpl CreateEllipseGeometry(Rect rect) => new EllipseGeometryImpl(rect); + + public IGeometryImpl CreateLineGeometry(Point p1, Point p2) => new LineGeometryImpl(p1, p2); + + public IGeometryImpl CreateRectangleGeometry(Rect rect) => new RectangleGeometryImpl(rect); + /// public IStreamGeometryImpl CreateStreamGeometry() { @@ -98,13 +114,23 @@ namespace Avalonia.Skia DisableTextLcdRendering = false, GrContext = GrContext }; - + return new SurfaceRenderTarget(createInfo); } /// - public virtual IRenderTarget CreateRenderTarget(IEnumerable surfaces) + public IRenderTarget CreateRenderTarget(IEnumerable surfaces) { + if (_customSkiaGpu != null) + { + ICustomSkiaRenderTarget customRenderTarget = _customSkiaGpu.TryCreateRenderTarget(surfaces); + + if (customRenderTarget != null) + { + return new CustomRenderTarget(customRenderTarget); + } + } + foreach (var surface in surfaces) { if (surface is IGlPlatformSurface glSurface && GrContext != null) diff --git a/src/Skia/Avalonia.Skia/RectangleGeometryImpl.cs b/src/Skia/Avalonia.Skia/RectangleGeometryImpl.cs new file mode 100644 index 0000000000..a873e8e2df --- /dev/null +++ b/src/Skia/Avalonia.Skia/RectangleGeometryImpl.cs @@ -0,0 +1,25 @@ +// 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 SkiaSharp; + +namespace Avalonia.Skia +{ + /// + /// A Skia implementation of a . + /// + internal class RectangleGeometryImpl : GeometryImpl + { + public override Rect Bounds { get; } + public override SKPath EffectivePath { get; } + + public RectangleGeometryImpl(Rect rect) + { + var path = new SKPath(); + path.AddRect(rect.ToSKRect()); + + EffectivePath = path; + Bounds = rect; + } + } +} diff --git a/src/Skia/Avalonia.Skia/SkiaApplicationExtensions.cs b/src/Skia/Avalonia.Skia/SkiaApplicationExtensions.cs index f4412df473..102f1f92aa 100644 --- a/src/Skia/Avalonia.Skia/SkiaApplicationExtensions.cs +++ b/src/Skia/Avalonia.Skia/SkiaApplicationExtensions.cs @@ -20,8 +20,9 @@ namespace Avalonia /// Configure builder. public static T UseSkia(this T builder) where T : AppBuilderBase, new() { - builder.UseRenderingSubsystem(() => SkiaPlatform.Initialize(), "Skia"); - return builder; + return builder.UseRenderingSubsystem(() => SkiaPlatform.Initialize( + AvaloniaLocator.Current.GetService() ?? new SkiaOptions()), + "Skia"); } } } diff --git a/src/Skia/Avalonia.Skia/SkiaOptions.cs b/src/Skia/Avalonia.Skia/SkiaOptions.cs new file mode 100644 index 0000000000..bac1849be8 --- /dev/null +++ b/src/Skia/Avalonia.Skia/SkiaOptions.cs @@ -0,0 +1,19 @@ +// 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 Avalonia.Skia; + +namespace Avalonia +{ + /// + /// Options for Skia rendering subsystem. + /// + public class SkiaOptions + { + /// + /// Custom gpu factory to use. Can be used to customize behavior of Skia renderer. + /// + public Func CustomGpuFactory { get; set; } + } +} diff --git a/src/Skia/Avalonia.Skia/SkiaPlatform.cs b/src/Skia/Avalonia.Skia/SkiaPlatform.cs index a9d69aea31..f16e967f42 100644 --- a/src/Skia/Avalonia.Skia/SkiaPlatform.cs +++ b/src/Skia/Avalonia.Skia/SkiaPlatform.cs @@ -15,8 +15,14 @@ namespace Avalonia.Skia /// public static void Initialize() { - var renderInterface = new PlatformRenderInterface(); - + Initialize(new SkiaOptions()); + } + + public static void Initialize(SkiaOptions options) + { + var customGpu = options.CustomGpuFactory?.Invoke(); + var renderInterface = new PlatformRenderInterface(customGpu); + AvaloniaLocator.CurrentMutable .Bind().ToConstant(renderInterface); } diff --git a/src/Skia/Avalonia.Skia/StreamGeometryImpl.cs b/src/Skia/Avalonia.Skia/StreamGeometryImpl.cs index c19ff79d87..2764c65c6f 100644 --- a/src/Skia/Avalonia.Skia/StreamGeometryImpl.cs +++ b/src/Skia/Avalonia.Skia/StreamGeometryImpl.cs @@ -10,7 +10,7 @@ namespace Avalonia.Skia /// /// A Skia implementation of a . /// - public class StreamGeometryImpl : GeometryImpl, IStreamGeometryImpl + internal class StreamGeometryImpl : GeometryImpl, IStreamGeometryImpl { private Rect _bounds; private readonly SKPath _effectivePath; diff --git a/src/Skia/Avalonia.Skia/SurfaceRenderTarget.cs b/src/Skia/Avalonia.Skia/SurfaceRenderTarget.cs index 4b7eae1af4..9340c9add4 100644 --- a/src/Skia/Avalonia.Skia/SurfaceRenderTarget.cs +++ b/src/Skia/Avalonia.Skia/SurfaceRenderTarget.cs @@ -14,7 +14,7 @@ namespace Avalonia.Skia /// /// Skia render target that writes to a surface. /// - public class SurfaceRenderTarget : IRenderTargetBitmapImpl, IDrawableBitmapImpl + internal class SurfaceRenderTarget : IRenderTargetBitmapImpl, IDrawableBitmapImpl { private readonly SKSurface _surface; private readonly SKCanvas _canvas; diff --git a/src/Skia/Avalonia.Skia/TransformedGeometryImpl.cs b/src/Skia/Avalonia.Skia/TransformedGeometryImpl.cs index e95069eef3..9826bc2ce3 100644 --- a/src/Skia/Avalonia.Skia/TransformedGeometryImpl.cs +++ b/src/Skia/Avalonia.Skia/TransformedGeometryImpl.cs @@ -9,7 +9,7 @@ namespace Avalonia.Skia /// /// A Skia implementation of a . /// - public class TransformedGeometryImpl : GeometryImpl, ITransformedGeometryImpl + internal class TransformedGeometryImpl : GeometryImpl, ITransformedGeometryImpl { /// /// Initializes a new instance of the class. diff --git a/src/Skia/Avalonia.Skia/WriteableBitmapImpl.cs b/src/Skia/Avalonia.Skia/WriteableBitmapImpl.cs index c9d6fa6c11..fea21cde58 100644 --- a/src/Skia/Avalonia.Skia/WriteableBitmapImpl.cs +++ b/src/Skia/Avalonia.Skia/WriteableBitmapImpl.cs @@ -13,7 +13,7 @@ namespace Avalonia.Skia /// /// Skia based writeable bitmap. /// - public class WriteableBitmapImpl : IWriteableBitmapImpl, IDrawableBitmapImpl + internal class WriteableBitmapImpl : IWriteableBitmapImpl, IDrawableBitmapImpl { private static readonly SKBitmapReleaseDelegate s_releaseDelegate = ReleaseProc; private readonly SKBitmap _bitmap; diff --git a/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs b/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs index 8412a65e23..5ab9a8f74d 100644 --- a/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs +++ b/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs @@ -182,10 +182,10 @@ namespace Avalonia.Direct2D1 return new WriteableWicBitmapImpl(size, dpi, format); } - public IStreamGeometryImpl CreateStreamGeometry() - { - return new StreamGeometryImpl(); - } + public IGeometryImpl CreateEllipseGeometry(Rect rect) => new EllipseGeometryImpl(rect); + public IGeometryImpl CreateLineGeometry(Point p1, Point p2) => new LineGeometryImpl(p1, p2); + public IGeometryImpl CreateRectangleGeometry(Rect rect) => new RectangleGeometryImpl(rect); + public IStreamGeometryImpl CreateStreamGeometry() => new StreamGeometryImpl(); public IBitmapImpl LoadBitmap(string fileName) { diff --git a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs index 6123088d7e..e90d444c44 100644 --- a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs +++ b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using Avalonia.Media; using Avalonia.Platform; using Avalonia.Rendering; +using Avalonia.Rendering.SceneGraph; using Avalonia.Utilities; using SharpDX; using SharpDX.Direct2D1; @@ -508,5 +509,7 @@ namespace Avalonia.Direct2D1.Media { PopLayer(); } + + public void Custom(ICustomDrawOperation custom) => custom.Render(this); } } diff --git a/src/Windows/Avalonia.Direct2D1/Media/EllipseGeometryImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/EllipseGeometryImpl.cs new file mode 100644 index 0000000000..9440966406 --- /dev/null +++ b/src/Windows/Avalonia.Direct2D1/Media/EllipseGeometryImpl.cs @@ -0,0 +1,27 @@ +// 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 SharpDX.Direct2D1; + +namespace Avalonia.Direct2D1.Media +{ + /// + /// A Direct2D implementation of a . + /// + internal class EllipseGeometryImpl : GeometryImpl + { + /// + /// Initializes a new instance of the class. + /// + public EllipseGeometryImpl(Rect rect) + : base(CreateGeometry(rect)) + { + } + + private static Geometry CreateGeometry(Rect rect) + { + var ellipse = new Ellipse(rect.Center.ToSharpDX(), (float)rect.Width / 2, (float)rect.Height / 2); + return new EllipseGeometry(Direct2D1Platform.Direct2D1Factory, ellipse); + } + } +} diff --git a/src/Windows/Avalonia.Direct2D1/Media/FormattedTextImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/FormattedTextImpl.cs index b3cc4c8e0d..b73deb1f0a 100644 --- a/src/Windows/Avalonia.Direct2D1/Media/FormattedTextImpl.cs +++ b/src/Windows/Avalonia.Direct2D1/Media/FormattedTextImpl.cs @@ -9,7 +9,7 @@ using DWrite = SharpDX.DirectWrite; namespace Avalonia.Direct2D1.Media { - public class FormattedTextImpl : IFormattedTextImpl + internal class FormattedTextImpl : IFormattedTextImpl { public FormattedTextImpl( string text, diff --git a/src/Windows/Avalonia.Direct2D1/Media/LineGeometryImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/LineGeometryImpl.cs new file mode 100644 index 0000000000..6b73fce309 --- /dev/null +++ b/src/Windows/Avalonia.Direct2D1/Media/LineGeometryImpl.cs @@ -0,0 +1,27 @@ +// 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 SharpDX.Direct2D1; + +namespace Avalonia.Direct2D1.Media +{ + /// + /// A Direct2D implementation of a . + /// + internal class LineGeometryImpl : StreamGeometryImpl + { + /// + /// Initializes a new instance of the class. + /// + public LineGeometryImpl(Point p1, Point p2) + { + using (var sink = ((PathGeometry)Geometry).Open()) + { + sink.BeginFigure(p1.ToSharpDX(), FigureBegin.Hollow); + sink.AddLine(p2.ToSharpDX()); + sink.EndFigure(FigureEnd.Open); + sink.Close(); + } + } + } +} diff --git a/src/Windows/Avalonia.Direct2D1/Media/RectangleGeometryImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/RectangleGeometryImpl.cs new file mode 100644 index 0000000000..194de4dd14 --- /dev/null +++ b/src/Windows/Avalonia.Direct2D1/Media/RectangleGeometryImpl.cs @@ -0,0 +1,26 @@ +// 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 SharpDX.Direct2D1; + +namespace Avalonia.Direct2D1.Media +{ + /// + /// A Direct2D implementation of a . + /// + internal class RectangleGeometryImpl : GeometryImpl + { + /// + /// Initializes a new instance of the class. + /// + public RectangleGeometryImpl(Rect rect) + : base(CreateGeometry(rect)) + { + } + + private static Geometry CreateGeometry(Rect rect) + { + return new RectangleGeometry(Direct2D1Platform.Direct2D1Factory, rect.ToDirect2D()); + } + } +} diff --git a/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs b/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs index 5209014271..6b0d30f250 100644 --- a/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs +++ b/src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs @@ -122,14 +122,16 @@ namespace Avalonia.Direct2D1 /// The Direct2D brush. public static StrokeStyle ToDirect2DStrokeStyle(this Avalonia.Media.Pen pen, Factory factory) { + var d2dLineCap = pen.LineCap.ToDirect2D(); + var properties = new StrokeStyleProperties { DashStyle = DashStyle.Solid, MiterLimit = (float)pen.MiterLimit, LineJoin = pen.LineJoin.ToDirect2D(), - StartCap = pen.StartLineCap.ToDirect2D(), - EndCap = pen.EndLineCap.ToDirect2D(), - DashCap = pen.DashCap.ToDirect2D() + StartCap = d2dLineCap, + EndCap = d2dLineCap, + DashCap = d2dLineCap }; float[] dashes = null; if (pen.DashStyle?.Dashes != null && pen.DashStyle.Dashes.Count > 0) diff --git a/src/Windows/Avalonia.Win32.Interop/Wpf/Direct2DImageSurface.cs b/src/Windows/Avalonia.Win32.Interop/Wpf/Direct2DImageSurface.cs index 400dd59ea9..5b04c5d7ff 100644 --- a/src/Windows/Avalonia.Win32.Interop/Wpf/Direct2DImageSurface.cs +++ b/src/Windows/Avalonia.Win32.Interop/Wpf/Direct2DImageSurface.cs @@ -50,7 +50,7 @@ namespace Avalonia.Win32.Interop.Wpf { _resource = texture.QueryInterface(); - Target = new RenderTarget(AvaloniaLocator.Current.GetService(), surface, + Target = new RenderTarget(Direct2D1Platform.Direct2D1Factory, surface, new RenderTargetProperties { DpiX = (float) dpi.X, diff --git a/tests/Avalonia.Controls.UnitTests/ButtonTests.cs b/tests/Avalonia.Controls.UnitTests/ButtonTests.cs index 91b37596b7..9a751d4953 100644 --- a/tests/Avalonia.Controls.UnitTests/ButtonTests.cs +++ b/tests/Avalonia.Controls.UnitTests/ButtonTests.cs @@ -5,6 +5,7 @@ using Avalonia.Input; using Avalonia.Media; using Avalonia.Platform; using Avalonia.Rendering; +using Avalonia.UnitTests; using Avalonia.VisualTree; using Moq; using Xunit; @@ -21,6 +22,7 @@ namespace Avalonia.Controls.UnitTests { Command = command, }; + var root = new TestRoot { Child = target }; Assert.False(target.IsEnabled); command.IsEnabled = true; @@ -215,6 +217,39 @@ namespace Avalonia.Controls.UnitTests Assert.True(clicked); } + [Fact] + public void Button_Does_Not_Subscribe_To_Command_CanExecuteChanged_Until_Added_To_Logical_Tree() + { + var command = new TestCommand(true); + var target = new Button + { + Command = command, + }; + + Assert.Equal(0, command.SubscriptionCount); + } + + [Fact] + public void Button_Subscribes_To_Command_CanExecuteChanged_When_Added_To_Logical_Tree() + { + var command = new TestCommand(true); + var target = new Button { Command = command }; + var root = new TestRoot { Child = target }; + + Assert.Equal(1, command.SubscriptionCount); + } + + [Fact] + public void Button_Unsubscribes_From_Command_CanExecuteChanged_When_Removed_From_Logical_Tree() + { + var command = new TestCommand(true); + var target = new Button { Command = command }; + var root = new TestRoot { Child = target }; + + root.Child = null; + Assert.Equal(0, command.SubscriptionCount); + } + private class TestButton : Button, IRenderRoot { public TestButton() @@ -298,6 +333,7 @@ namespace Avalonia.Controls.UnitTests private class TestCommand : ICommand { + private EventHandler _canExecuteChanged; private bool _enabled; public TestCommand(bool enabled) @@ -313,12 +349,18 @@ namespace Avalonia.Controls.UnitTests if (_enabled != value) { _enabled = value; - CanExecuteChanged?.Invoke(this, EventArgs.Empty); + _canExecuteChanged?.Invoke(this, EventArgs.Empty); } } } - public event EventHandler CanExecuteChanged; + public int SubscriptionCount { get; private set; } + + public event EventHandler CanExecuteChanged + { + add { _canExecuteChanged += value; ++SubscriptionCount; } + remove { _canExecuteChanged -= value; --SubscriptionCount; } + } public bool CanExecute(object parameter) => _enabled; diff --git a/tests/Avalonia.Controls.UnitTests/MenuItemTests.cs b/tests/Avalonia.Controls.UnitTests/MenuItemTests.cs index e7352af23e..32d154249c 100644 --- a/tests/Avalonia.Controls.UnitTests/MenuItemTests.cs +++ b/tests/Avalonia.Controls.UnitTests/MenuItemTests.cs @@ -1,6 +1,8 @@ using System; using System.Collections.Generic; using System.Text; +using System.Windows.Input; +using Avalonia.UnitTests; using Xunit; namespace Avalonia.Controls.UnitTests @@ -22,5 +24,57 @@ namespace Avalonia.Controls.UnitTests Assert.False(target.Focusable); } + + [Fact] + public void MenuItem_Does_Not_Subscribe_To_Command_CanExecuteChanged_Until_Added_To_Logical_Tree() + { + var command = new TestCommand(); + var target = new MenuItem + { + Command = command, + }; + + Assert.Equal(0, command.SubscriptionCount); + } + + [Fact] + public void MenuItem_Subscribes_To_Command_CanExecuteChanged_When_Added_To_Logical_Tree() + { + var command = new TestCommand(); + var target = new MenuItem { Command = command }; + var root = new TestRoot { Child = target }; + + Assert.Equal(1, command.SubscriptionCount); + } + + [Fact] + public void MenuItem_Unsubscribes_From_Command_CanExecuteChanged_When_Removed_From_Logical_Tree() + { + var command = new TestCommand(); + var target = new MenuItem { Command = command }; + var root = new TestRoot { Child = target }; + + root.Child = null; + Assert.Equal(0, command.SubscriptionCount); + } + + private class TestCommand : ICommand + { + private EventHandler _canExecuteChanged; + + public int SubscriptionCount { get; private set; } + + public event EventHandler CanExecuteChanged + { + add { _canExecuteChanged += value; ++SubscriptionCount; } + remove { _canExecuteChanged -= value; --SubscriptionCount; } + } + + public bool CanExecute(object parameter) => true; + + public void Execute(object parameter) + { + } + } } } diff --git a/tests/Avalonia.Controls.UnitTests/WindowTests.cs b/tests/Avalonia.Controls.UnitTests/WindowTests.cs index 8221dadc86..ee416c4cb0 100644 --- a/tests/Avalonia.Controls.UnitTests/WindowTests.cs +++ b/tests/Avalonia.Controls.UnitTests/WindowTests.cs @@ -292,6 +292,51 @@ namespace Avalonia.Controls.UnitTests } } + [Fact] + public void Calling_Show_On_Closed_Window_Should_Throw() + { + using (UnitTestApplication.Start(TestServices.StyledWindow)) + { + var windowImpl = Mock.Of(x => x.Scaling == 1); + var target = new Window(windowImpl); + + target.Show(); + target.Close(); + + var openedRaised = false; + target.Opened += (s, e) => openedRaised = true; + + var ex = Assert.Throws(() => target.Show()); + Assert.Equal("Cannot re-show a closed window.", ex.Message); + Assert.False(openedRaised); + } + } + + [Fact] + public async Task Calling_ShowDialog_On_Closed_Window_Should_Throw() + { + using (UnitTestApplication.Start(TestServices.StyledWindow)) + { + var parent = new Mock(); + var windowImpl = new Mock(); + windowImpl.SetupProperty(x => x.Closed); + windowImpl.Setup(x => x.Scaling).Returns(1); + + var target = new Window(windowImpl.Object); + var task = target.ShowDialog(parent.Object); + + windowImpl.Object.Closed(); + await task; + + var openedRaised = false; + target.Opened += (s, e) => openedRaised = true; + + var ex = await Assert.ThrowsAsync(() => target.ShowDialog(parent.Object)); + Assert.Equal("Cannot re-show a closed window.", ex.Message); + Assert.False(openedRaised); + } + } + [Fact] public void Window_Should_Be_Centered_When_WindowStartupLocation_Is_CenterScreen() { diff --git a/tests/Avalonia.ReactiveUI.UnitTests/AvaloniaActivationForViewFetcherTest.cs b/tests/Avalonia.ReactiveUI.UnitTests/AvaloniaActivationForViewFetcherTest.cs index 70a5504a7d..d9f1ce47dd 100644 --- a/tests/Avalonia.ReactiveUI.UnitTests/AvaloniaActivationForViewFetcherTest.cs +++ b/tests/Avalonia.ReactiveUI.UnitTests/AvaloniaActivationForViewFetcherTest.cs @@ -11,6 +11,7 @@ using DynamicData; using Xunit; using Splat; using Avalonia.Markup.Xaml; +using Avalonia.ReactiveUI; namespace Avalonia { diff --git a/tests/Avalonia.ReactiveUI.UnitTests/RoutedViewHostTest.cs b/tests/Avalonia.ReactiveUI.UnitTests/RoutedViewHostTest.cs index de09a1ea89..401d169896 100644 --- a/tests/Avalonia.ReactiveUI.UnitTests/RoutedViewHostTest.cs +++ b/tests/Avalonia.ReactiveUI.UnitTests/RoutedViewHostTest.cs @@ -14,6 +14,7 @@ using Avalonia.Markup.Xaml; using System.ComponentModel; using System.Threading.Tasks; using System.Reactive; +using Avalonia.ReactiveUI; namespace Avalonia { diff --git a/tests/Avalonia.RenderTests/Shapes/PathTests.cs b/tests/Avalonia.RenderTests/Shapes/PathTests.cs index 4703daca25..2fa93b49e2 100644 --- a/tests/Avalonia.RenderTests/Shapes/PathTests.cs +++ b/tests/Avalonia.RenderTests/Shapes/PathTests.cs @@ -334,11 +334,7 @@ namespace Avalonia.Direct2D1.RenderTests.Shapes CompareImages(); } -#if AVALONIA_SKIA_SKIP_FAIL - [Fact(Skip = "FIXME")] -#else [Fact] -#endif public async Task Path_With_PenLineCap() { Decorator target = new Decorator @@ -351,10 +347,8 @@ namespace Avalonia.Direct2D1.RenderTests.Shapes StrokeThickness = 10, HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Center, - StrokeDashCap = PenLineCap.Triangle, StrokeDashArray = new AvaloniaList(3, 1), - StrokeStartLineCap = PenLineCap.Round, - StrokeEndLineCap = PenLineCap.Square, + StrokeLineCap = PenLineCap.Round, Data = StreamGeometry.Parse("M 20,20 L 180,180"), } }; diff --git a/tests/Avalonia.RenderTests/Shapes/PolylineTests.cs b/tests/Avalonia.RenderTests/Shapes/PolylineTests.cs index 3b586d55ea..8afaeb8838 100644 --- a/tests/Avalonia.RenderTests/Shapes/PolylineTests.cs +++ b/tests/Avalonia.RenderTests/Shapes/PolylineTests.cs @@ -61,8 +61,7 @@ namespace Avalonia.Direct2D1.RenderTests.Shapes Points = polylinePoints, Stretch = Stretch.Uniform, StrokeJoin = PenLineJoin.Round, - StrokeStartLineCap = PenLineCap.Round, - StrokeEndLineCap = PenLineCap.Round, + StrokeLineCap = PenLineCap.Round, StrokeThickness = 10 } }; diff --git a/tests/Avalonia.UnitTests/MockPlatformRenderInterface.cs b/tests/Avalonia.UnitTests/MockPlatformRenderInterface.cs index 0e2abb314d..a3cc3dec17 100644 --- a/tests/Avalonia.UnitTests/MockPlatformRenderInterface.cs +++ b/tests/Avalonia.UnitTests/MockPlatformRenderInterface.cs @@ -22,6 +22,21 @@ namespace Avalonia.UnitTests return Mock.Of(); } + public IGeometryImpl CreateEllipseGeometry(Rect rect) + { + return Mock.Of(); + } + + public IGeometryImpl CreateLineGeometry(Point p1, Point p2) + { + return Mock.Of(); + } + + public IGeometryImpl CreateRectangleGeometry(Rect rect) + { + return Mock.Of(); + } + public IRenderTarget CreateRenderTarget(IEnumerable surfaces) { return Mock.Of(); diff --git a/tests/Avalonia.Visuals.UnitTests/VisualTree/MockRenderInterface.cs b/tests/Avalonia.Visuals.UnitTests/VisualTree/MockRenderInterface.cs index fec0f0831a..03470670d2 100644 --- a/tests/Avalonia.Visuals.UnitTests/VisualTree/MockRenderInterface.cs +++ b/tests/Avalonia.Visuals.UnitTests/VisualTree/MockRenderInterface.cs @@ -56,6 +56,21 @@ namespace Avalonia.Visuals.UnitTests.VisualTree throw new NotImplementedException(); } + public IGeometryImpl CreateEllipseGeometry(Rect rect) + { + throw new NotImplementedException(); + } + + public IGeometryImpl CreateLineGeometry(Point p1, Point p2) + { + throw new NotImplementedException(); + } + + public IGeometryImpl CreateRectangleGeometry(Rect rect) + { + throw new NotImplementedException(); + } + class MockStreamGeometry : IStreamGeometryImpl { private MockStreamGeometryContext _impl = new MockStreamGeometryContext(); diff --git a/tests/TestFiles/Direct2D1/Shapes/Path/Path_With_PenLineCap.expected.png b/tests/TestFiles/Direct2D1/Shapes/Path/Path_With_PenLineCap.expected.png index d33068d62c..a61ba9f080 100644 Binary files a/tests/TestFiles/Direct2D1/Shapes/Path/Path_With_PenLineCap.expected.png and b/tests/TestFiles/Direct2D1/Shapes/Path/Path_With_PenLineCap.expected.png differ diff --git a/tests/TestFiles/Skia/Shapes/Path/Path_With_PenLineCap.expected.png b/tests/TestFiles/Skia/Shapes/Path/Path_With_PenLineCap.expected.png index d33068d62c..a61ba9f080 100644 Binary files a/tests/TestFiles/Skia/Shapes/Path/Path_With_PenLineCap.expected.png and b/tests/TestFiles/Skia/Shapes/Path/Path_With_PenLineCap.expected.png differ