Optimalization (#263)

Mateusz-Nejman · web-flow · commit 556760c9a757 · 2025-05-08T12:17:27.000+02:00
* Change DispatcherPriority for Invalidation; Speed up Layer rendering

* SkiaUtils::SetPixel SKBitmap::SetPixel usage replaced with optimized alternative; Pen drawing optimized

* TODO

* Remove ClipToBounds from TransparentBackground

* Remove redundant properties from PaintCanvasImageControl

* Move PaintCanvas related classes to PaintCanvas namespace
diff --git a/Pixed.Application/Controls/PaintCanvas/GridOverlay.cs b/Pixed.Application/Controls/PaintCanvas/GridOverlay.cs
@@ -5,11 +5,11 @@
 using System;
 
 
-namespace Pixed.Application.Controls;
-internal class ImageGrid : OverlayControl
+namespace Pixed.Application.Controls.PaintCanvas;
+internal class GridOverlay : OverlayControl
 {
     public const int MinGridSize = 15;
-    public ImageGrid()
+    public GridOverlay()
     {
         ClipToBounds = false;
     }
diff --git a/Pixed.Application/Controls/PaintCanvas/OverlayControl.cs b/Pixed.Application/Controls/PaintCanvas/OverlayControl.cs
@@ -8,7 +8,7 @@
 using Pixed.Application.Zoom;
 using SkiaSharp;
 
-namespace Pixed.Application.Controls;
+namespace Pixed.Application.Controls.PaintCanvas;
 internal abstract class OverlayControl : Control
 {
     class DrawOperation(Rect bounds, OverlayControl instance) : ICustomDrawOperation
diff --git a/Pixed.Application/Controls/PaintCanvas/PaintContainer.cs b/Pixed.Application/Controls/PaintCanvas/PaintContainer.cs
@@ -4,38 +4,25 @@
 using Avalonia.Controls;
 using Avalonia.Media;
 using Avalonia.Metadata;
-using Avalonia.Threading;
 using Pixed.Core.Models;
+using SkiaSharp;
 
-namespace Pixed.Application.Controls;
+namespace Pixed.Application.Controls.PaintCanvas;
 
-internal class PaintCanvasImageControl : Control
+internal class PaintContainer : Control
 {
     /// <summary>
     /// Defines the <see cref="Source"/> property.
     /// </summary>
     public static readonly StyledProperty<PixelImage?> SourceProperty =
-        AvaloniaProperty.Register<PaintCanvasImageControl, PixelImage?>(nameof(Source));
+        AvaloniaProperty.Register<PaintContainer, PixelImage?>(nameof(Source));
 
-    /// <summary>
-    /// Defines the <see cref="Stretch"/> property.
-    /// </summary>
-    public static readonly StyledProperty<Stretch> StretchProperty =
-        AvaloniaProperty.Register<PaintCanvasImageControl, Stretch>(nameof(Stretch), Stretch.Uniform);
-
-    /// <summary>
-    /// Defines the <see cref="StretchDirection"/> property.
-    /// </summary>
-    public static readonly StyledProperty<StretchDirection> StretchDirectionProperty =
-        AvaloniaProperty.Register<PaintCanvasImageControl, StretchDirection>(
-            nameof(StretchDirection),
-            StretchDirection.Both);
 
-    static PaintCanvasImageControl()
+    static PaintContainer()
     {
-        AffectsRender<PaintCanvasImageControl>(SourceProperty, StretchProperty, StretchDirectionProperty);
-        AffectsMeasure<PaintCanvasImageControl>(SourceProperty, StretchProperty, StretchDirectionProperty);
-        AutomationProperties.ControlTypeOverrideProperty.OverrideDefaultValue<PaintCanvasImageControl>(AutomationControlType.Image);
+        AffectsRender<PaintContainer>(SourceProperty);
+        AffectsMeasure<PaintContainer>(SourceProperty);
+        AutomationProperties.ControlTypeOverrideProperty.OverrideDefaultValue<PaintContainer>(AutomationControlType.Image);
     }
 
     private readonly PixelDrawOperation _image = new();
@@ -50,24 +37,6 @@ public PixelImage? Source
         set => SetValue(SourceProperty, value);
     }
 
-    /// <summary>
-    /// Gets or sets a value controlling how the image will be stretched.
-    /// </summary>
-    public Stretch Stretch
-    {
-        get => GetValue(StretchProperty);
-        set => SetValue(StretchProperty, value);
-    }
-
-    /// <summary>
-    /// Gets or sets a value controlling in what direction the image will be stretched.
-    /// </summary>
-    public StretchDirection StretchDirection
-    {
-        get => GetValue(StretchDirectionProperty);
-        set => SetValue(StretchDirectionProperty, value);
-    }
-
     /// <inheritdoc />
     protected override bool BypassFlowDirectionPolicies => true;
 
@@ -97,8 +66,6 @@ public sealed override void Render(DrawingContext context)
             _image.Bounds = sourceRect;
             context.DrawImage(_image, sourceRect, sourceRect);
         }
-
-        Dispatcher.UIThread.Post(InvalidateVisual, DispatcherPriority.Input);
     }
 
     /// <summary>
@@ -113,7 +80,7 @@ protected override Size MeasureOverride(Size availableSize)
 
         if (source != null)
         {
-            result = Stretch.CalculateSize(availableSize, new Size(source.Width, source.Height), StretchDirection);
+            result = Stretch.Uniform.CalculateSize(availableSize, new Size(source.Width, source.Height), StretchDirection.Both);
         }
 
         return result;
@@ -122,17 +89,13 @@ protected override Size MeasureOverride(Size availableSize)
     /// <inheritdoc/>
     protected override Size ArrangeOverride(Size finalSize)
     {
-        var source = Source?.Render();
-
-        if (source != null)
+        if (Source?.Render() is SKBitmap source)
         {
             var sourceSize = new Size(source.Width, source.Height);
-            var result = Stretch.CalculateSize(finalSize, sourceSize);
+            var result = Stretch.Uniform.CalculateSize(finalSize, sourceSize);
             return result;
         }
-        else
-        {
-            return new Size();
-        }
+
+        return new Size();
     }
 }
diff --git a/Pixed.Application/Controls/PaintCanvas/PaintControl.axaml b/Pixed.Application/Controls/PaintCanvas/PaintControl.axaml
@@ -1,16 +1,16 @@
-﻿<UserControl x:Class="Pixed.Application.Controls.PaintCanvas"
+﻿<UserControl x:Class="Pixed.Application.Controls.PaintCanvas.PaintControl"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:local="clr-namespace:Pixed.Application.Controls"
-			 xmlns:controls="clr-namespace:Pixed.Application.Controls"
+			 xmlns:paintCanvas="clr-namespace:Pixed.Application.Controls.PaintCanvas"
 			 xmlns:gestures="clr-namespace:Pixed.Application.Controls.Gestures"
              xmlns:viewmodels="clr-namespace:Pixed.Application.ViewModels"
 			 xmlns:zoom="clr-namespace:Pixed.Application.Zoom"
              mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800"
-			 x:DataType="viewmodels:PaintCanvasViewModel">
+			 x:DataType="viewmodels:PaintControlViewModel">
   <Grid>
     <Grid.RowDefinitions>
       <RowDefinition Height="*"/>
@@ -24,10 +24,10 @@
         <Border BorderBrush="{StaticResource ButtonBorder}" BorderThickness="2 0 2 2">
           <zoom:ZoomControl Name="zoomControl" GesturesEnabled="{Binding GestureZoomEnabled, Mode=TwoWay}" ZoomWidth="{Binding GridWidth, Mode=TwoWay}" ZoomHeight="{Binding GridHeight, Mode=TwoWay}">
             <zoom:ZoomControl.ZoomContent>
-              <controls:TransparentBackground IsHitTestVisible="False" Width="{Binding ScaledGridWidth}" Height="{Binding ScaledGridHeight}" Name="transparentBackground"/>
-              <controls:PaintCanvasImageControl Name="image" RenderOptions.BitmapInterpolationMode="None" Source="{Binding RenderModel}"/>
-              <controls:ImageGrid Width="{Binding ScaledGridWidth}" Height="{Binding ScaledGridHeight}" Name="gridCanvas" IsHitTestVisible="False"/>
-              <controls:SelectionOverlay Width="{Binding ScaledGridWidth}" Height="{Binding ScaledGridHeight}" Name="selectionOverlay" IsHitTestVisible="False"/>
+              <paintCanvas:TransparentBackground IsHitTestVisible="False" Width="{Binding ScaledGridWidth}" Height="{Binding ScaledGridHeight}" Name="transparentBackground"/>
+              <paintCanvas:PaintContainer Name="image" RenderOptions.BitmapInterpolationMode="None" Source="{Binding RenderModel}"/>
+              <paintCanvas:GridOverlay Width="{Binding ScaledGridWidth}" Height="{Binding ScaledGridHeight}" Name="gridCanvas" IsHitTestVisible="False"/>
+              <paintCanvas:SelectionOverlay Width="{Binding ScaledGridWidth}" Height="{Binding ScaledGridHeight}" Name="selectionOverlay" IsHitTestVisible="False"/>
             </zoom:ZoomControl.ZoomContent>
           </zoom:ZoomControl>
         </Border>
diff --git a/Pixed.Application/Controls/PaintCanvas/PaintControl.axaml.cs b/Pixed.Application/Controls/PaintCanvas/PaintControl.axaml.cs
@@ -9,13 +9,13 @@
 using Pixed.Core.Models;
 using System;
 
-namespace Pixed.Application.Controls;
+namespace Pixed.Application.Controls.PaintCanvas;
 
-internal partial class PaintCanvas : ExtendedControl<PaintCanvasViewModel>
+internal partial class PaintControl : ExtendedControl<PaintControlViewModel>
 {
     private readonly int _scrollBarSize = 18;
     private readonly IDisposable _zoomChanged;
-    public PaintCanvas() : base()
+    public PaintControl() : base()
     {
         InitializeComponent();
         SizeChanged += PaintCanvas_SizeChanged;
diff --git a/Pixed.Application/Controls/PaintCanvas/SelectionOverlay.cs b/Pixed.Application/Controls/PaintCanvas/SelectionOverlay.cs
@@ -7,7 +7,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Pixed.Application.Controls;
+namespace Pixed.Application.Controls.PaintCanvas;
 internal class SelectionOverlay : OverlayControl
 {
     private List<Tuple<SKPoint, SKPoint>> _lines = [];
diff --git a/Pixed.Application/Controls/PaintCanvas/TransparentBackground.cs b/Pixed.Application/Controls/PaintCanvas/TransparentBackground.cs
@@ -3,15 +3,15 @@
 using Pixed.Core;
 using SkiaSharp;
 
-namespace Pixed.Application.Controls;
+namespace Pixed.Application.Controls.PaintCanvas;
 internal class TransparentBackground : OverlayControl
 {
     private readonly SKBitmap _transparentBackground;
     private readonly SKShader _shader;
     private readonly SKPaint _paint;
     public TransparentBackground()
     {
-        ClipToBounds = true;
+        ClipToBounds = false;
         _transparentBackground = CreateTransparentBackground();
         _shader = SKShader.CreateBitmap(_transparentBackground, SKShaderTileMode.Repeat, SKShaderTileMode.Repeat);
         _paint = new SKPaint()
diff --git a/Pixed.Application/Controls/PixelImageControl.cs b/Pixed.Application/Controls/PixelImageControl.cs
@@ -106,7 +106,7 @@ public sealed override void Render(DrawingContext context)
             context.DrawImage(_image, sourceRect, destRect);
         }
 
-        Dispatcher.UIThread.Post(InvalidateVisual, DispatcherPriority.Input);
+        Dispatcher.UIThread.Post(InvalidateVisual, DispatcherPriority.Background);
     }
 
     /// <summary>
diff --git a/Pixed.Application/DependencyInjection/ApplicationDependencyRegister.cs b/Pixed.Application/DependencyInjection/ApplicationDependencyRegister.cs
@@ -19,7 +19,7 @@ public void Register(ref IServiceCollection collection)
         collection.AddSingleton<FramesSectionViewModel>();
         collection.AddSingleton<LayersSectionViewModel>();
         collection.AddSingleton<MainViewModel>();
-        collection.AddSingleton<PaintCanvasViewModel>();
+        collection.AddSingleton<PaintControlViewModel>();
         collection.AddSingleton<PaletteSectionViewModel>();
         collection.AddSingleton<ProjectsSectionViewModel>();
         collection.AddSingleton<PropertiesSectionViewModel>();
diff --git a/Pixed.Application/Pages/Main.axaml b/Pixed.Application/Pages/Main.axaml
@@ -4,7 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Pixed"
-        xmlns:controls="clr-namespace:Pixed.Application.Controls"
+        xmlns:paintCanvas="clr-namespace:Pixed.Application.Controls.PaintCanvas"
         xmlns:mainsections="clr-namespace:Pixed.Application.Controls.MainWindowSections"
         xmlns:dd="urn:gong-wpf-dragdrop"
         xmlns:viewmodels="clr-namespace:Pixed.Application.ViewModels"
@@ -35,7 +35,7 @@
 					<RowDefinition Height="*"/>
 				</Grid.RowDefinitions>
 				<mainsections:ProjectsSection/>
-				<controls:PaintCanvas Grid.Row="1" x:Name="paintCanvas"/>
+        <paintCanvas:PaintControl Grid.Row="1" x:Name="paintCanvas"/>
 			</Grid>
 			<mainsections:PropertiesSection Grid.Column="2" Width="242"/>
 		</Grid>
diff --git a/Pixed.Application/ViewModels/PaintControlViewModel.cs b/Pixed.Application/ViewModels/PaintControlViewModel.cs
@@ -2,6 +2,7 @@
 using Avalonia.Media;
 using Avalonia.Platform;
 using Pixed.Application.Controls;
+using Pixed.Application.Controls.PaintCanvas;
 using Pixed.Application.Input;
 using Pixed.Application.Menu;
 using Pixed.Application.Models;
@@ -20,7 +21,7 @@
 
 namespace Pixed.Application.ViewModels;
 
-internal class PaintCanvasViewModel : ExtendedViewModel, IDisposable
+internal class PaintControlViewModel : ExtendedViewModel, IDisposable
 {
     private readonly ApplicationData _applicationData;
     private readonly ToolsManager _toolSelector;
@@ -191,7 +192,7 @@ public bool IsSelectionButtonVisible
 
     public string ZoomText { get; set; }
     public ZoomControl ZoomContainer { get; set; }
-    public ImageGrid GridCanvas { get; set; }
+    public GridOverlay GridCanvas { get; set; }
     public SelectionOverlay SelectionOverlay { get; set; }
     public TransparentBackground TransparentBackground { get; set; }
     public ImageBrush TransparentBrush
@@ -234,7 +235,7 @@ public bool IsPropertiesViewButtonVisible
         }
     }
 
-    public PaintCanvasViewModel(ApplicationData applicationData, ToolsManager toolSelector, ToolMoveCanvas toolMoveCanvas, SelectionManager selectionManager, 
+    public PaintControlViewModel(ApplicationData applicationData, ToolsManager toolSelector, ToolMoveCanvas toolMoveCanvas, SelectionManager selectionManager, 
         FramesSectionViewModel framesSectionViewModel, PropertiesSectionViewModel propertiesSectionViewModel, SelectionMenu selectionMenu)
     {
         _applicationData = applicationData;
diff --git a/Pixed.Application/ViewModels/ToolsSectionViewModel.cs b/Pixed.Application/ViewModels/ToolsSectionViewModel.cs
@@ -15,10 +15,10 @@
 using IPlatformSettings = Pixed.Application.Platform.IPlatformSettings;
 
 namespace Pixed.Application.ViewModels;
-internal class ToolsSectionViewModel(ToolsManager toolSelector, PaintCanvasViewModel paintCanvas) : ExtendedViewModel
+internal class ToolsSectionViewModel(ToolsManager toolSelector, PaintControlViewModel paintCanvas) : ExtendedViewModel
 {
     private readonly ToolsManager _toolSelector = toolSelector;
-    private readonly PaintCanvasViewModel _paintCanvas = paintCanvas;
+    private readonly PaintControlViewModel _paintCanvas = paintCanvas;
     private readonly Dictionary<string, ToolRadioButton> _radios = [];
 
     public void InitializeTools(StackPanel stackPanel)
diff --git a/Pixed.Application/Zoom/Internals/BaseControl.cs b/Pixed.Application/Zoom/Internals/BaseControl.cs
@@ -6,6 +6,7 @@
 using Avalonia.Media.Transformation;
 using Avalonia.VisualTree;
 using Pixed.Application.Controls;
+using Pixed.Application.Controls.PaintCanvas;
 using System;
 using System.Linq;
 using System.Reactive;
diff --git a/Pixed.Application/Zoom/Internals/ChildrenControl.cs b/Pixed.Application/Zoom/Internals/ChildrenControl.cs
@@ -2,6 +2,7 @@
 using Avalonia.Input;
 using Avalonia.Media;
 using Pixed.Application.Controls;
+using Pixed.Application.Controls.PaintCanvas;
 using Pixed.Core;
 using System.Collections.Specialized;
 
diff --git a/Pixed.Common/Tools/BaseTool.cs b/Pixed.Common/Tools/BaseTool.cs
@@ -134,7 +134,6 @@ public void SetProperty(string name, bool value)
     protected static void SetPixels(Frame frame, List<Pixel> pixels)
     {
         frame.SetPixels(pixels);
-        Subjects.FrameModified.OnNext(frame);
     }
 
     protected static void SetPixels(Layer layer, List<Pixel> pixels)
diff --git a/Pixed.Common/Tools/ToolLighten.cs b/Pixed.Common/Tools/ToolLighten.cs
@@ -3,6 +3,7 @@
 using Pixed.Core;
 using Pixed.Core.Models;
 using Pixed.Core.Selection;
+using Pixed.Core.Utils;
 using SkiaSharp;
 using System.Collections.Generic;
 
@@ -12,6 +13,8 @@ public class ToolLighten(ApplicationData applicationData) : ToolPenBase(applicat
     private const string PROP_DARKEN = "Darken";
     private const string PROP_APPLY_ONCE = "Apply once per pixel";
 
+    private readonly List<Point> _modified = [];
+
     public override string ImagePath => "avares://Pixed.Application/Resources/fluent-icons/ic_fluent_add_subtract_circle_48_regular.svg";
     public override string Name => "Lighten tool";
     public override string Id => "tool_lighten";
@@ -30,10 +33,18 @@ public override void ApplyTool(Point point, Frame frame, ref SKBitmap overlay, K
         _prev = point;
 
         var modifiedColor = GetModifierColor(point, frame, ref overlay, shiftPressed, controlPressed);
+
+        _modified.AddRange(PaintUtils.GetToolPoints(point, _applicationData.ToolSize));
         DrawOnOverlay(modifiedColor, point, frame, ref overlay, selection);
         Subjects.OverlayModified.OnNext(overlay);
     }
 
+    public override void ReleaseTool(Point point, Frame frame, ref SKBitmap overlay, KeyState keyState, BaseSelection? selection)
+    {
+        base.ReleaseTool(point, frame, ref overlay, keyState, selection);
+        _modified.Clear();
+    }
+
     public override List<ToolProperty> GetToolProperties()
     {
         return [
@@ -47,7 +58,7 @@ private int GetModifierColor(Point point, Frame frame, ref SKBitmap overlay, boo
         UniColor overlayColor = overlay.GetPixel(point.X, point.Y);
         UniColor frameColor = frame.GetPixel(point);
 
-        bool isPixelModified = IsPixelModified(point);
+        bool isPixelModified = _modified.Contains(point);
         var pixelColor = isPixelModified ? overlayColor : frameColor;
 
         bool isTransparent = pixelColor == UniColor.Transparent;
diff --git a/Pixed.Common/Tools/ToolPenBase.cs b/Pixed.Common/Tools/ToolPenBase.cs
diff --git a/Pixed.Core/Models/Layer.cs b/Pixed.Core/Models/Layer.cs
diff --git a/Pixed.Core/Models/PixedModel.cs b/Pixed.Core/Models/PixedModel.cs
diff --git a/Pixed.Core/Utils/ColorUtils.cs b/Pixed.Core/Utils/ColorUtils.cs
diff --git a/Pixed.Core/Utils/SkiaUtils.cs b/Pixed.Core/Utils/SkiaUtils.cs
diff --git a/Pixed.Tests/ColorUtilsTests.cs b/Pixed.Tests/ColorUtilsTests.cs

Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,11 @@`
`5`	`5`	`using System;`
`6`	`6`
`7`	`7`
`8`		`-namespace Pixed.Application.Controls;`
`9`		`-internal class ImageGrid : OverlayControl`
	`8`	`+namespace Pixed.Application.Controls.PaintCanvas;`
	`9`	`+internal class GridOverlay : OverlayControl`
`10`	`10`	`{`
`11`	`11`	`public const int MinGridSize = 15;`
`12`		`- public ImageGrid()`
	`12`	`+ public GridOverlay()`
`13`	`13`	`{`
`14`	`14`	`ClipToBounds = false;`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`using Pixed.Application.Zoom;`
`9`	`9`	`using SkiaSharp;`
`10`	`10`
`11`		`-namespace Pixed.Application.Controls;`
	`11`	`+namespace Pixed.Application.Controls.PaintCanvas;`
`12`	`12`	`internal abstract class OverlayControl : Control`
`13`	`13`	`{`
`14`	`14`	`class DrawOperation(Rect bounds, OverlayControl instance) : ICustomDrawOperation`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`using System;`
`8`	`8`	`using System.Collections.Generic;`
`9`	`9`
`10`		`-namespace Pixed.Application.Controls;`
	`10`	`+namespace Pixed.Application.Controls.PaintCanvas;`
`11`	`11`	`internal class SelectionOverlay : OverlayControl`
`12`	`12`	`{`
`13`	`13`	`private List<Tuple<SKPoint, SKPoint>> _lines = [];`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public sealed override void Render(DrawingContext context)`
`106`	`106`	`context.DrawImage(_image, sourceRect, destRect);`
`107`	`107`	`}`
`108`	`108`
`109`		`- Dispatcher.UIThread.Post(InvalidateVisual, DispatcherPriority.Input);`
	`109`	`+ Dispatcher.UIThread.Post(InvalidateVisual, DispatcherPriority.Background);`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`/// <summary>`