optimize winui GraphicsContainer paint event logic

aesalazar · Sep 18, 2024 · 2ab9221 · 2ab9221
1 parent 1dce55b
commit 2ab9221
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 16 deletions.
diff --git a/Asteroids.WinUi3/Classes/GraphicsContainer.cs b/Asteroids.WinUi3/Classes/GraphicsContainer.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading.Tasks;
@@ -14,9 +13,8 @@ namespace Asteroids.WinUi3.Classes
     /// <summary>
     /// Canvas Control to paint vectors.
     /// </summary>
-    internal sealed class GraphicsContainer : SKXamlCanvas, IGraphicContainer, IDisposable
+    internal sealed class GraphicsContainer : SKXamlCanvas, IGraphicContainer
     {
-        private bool _isDisposed;
         private IDictionary<DrawColor, SKPaint> _colorCache = new Dictionary<DrawColor, SKPaint>();
         private IEnumerable<IGraphicLine> _lastLines = [];
         private IEnumerable<IGraphicPolygon> _lastPolygons = [];
@@ -30,30 +28,21 @@ public Task Initialize(IDictionary<DrawColor, string> drawColorMap)
                 )
             );
 
-            PaintSurface += OnPaintSurface;
             return Task.CompletedTask;
         }
 
         public Task Draw(IEnumerable<IGraphicLine> lines, IEnumerable<IGraphicPolygon> polygons)
         {
-            if (_isDisposed)
-                return Task.CompletedTask;
-
             _lastLines = lines;
             _lastPolygons = polygons;
 
             Invalidate();
             return Task.CompletedTask;
         }
 
-        public void Dispose()
-        {
-            PaintSurface -= OnPaintSurface;
-            _isDisposed = true;
-        }
-
-        private void OnPaintSurface(object sender, SKPaintSurfaceEventArgs e)
+        protected override void OnPaintSurface(SKPaintSurfaceEventArgs e)
         {
+            base.OnPaintSurface(e);
             var canvas = e.Surface.Canvas;
             canvas.Clear();
 

diff --git a/Asteroids.WinUi3/Helpers/ColorHelper.cs b/Asteroids.WinUi3/Helpers/ColorHelper.cs
@@ -15,7 +15,7 @@ internal class ColorHelper
     /// <returns>Hydrated <see cref="SKPaint"/> object.</returns>
     public static SKPaint ColorHexToPaint(string colorHex)
     {
-        var hex = colorHex.Replace("#", "");
+        var hex = colorHex.Replace("#", string.Empty);
         var length = hex.Length;
 
         var bytes = new byte[length / 2];