Merge pull request #131 from taublast/2-A

1.2.9.2
taublast · Nov 21, 2024 · 5797714 · 5797714
2 parents 07274cf + 474181b
commit 5797714
Show file tree

Hide file tree

Showing 30 changed files with 1,879 additions and 169 deletions.
diff --git a/README.md b/README.md
@@ -6,6 +6,10 @@
 Rendering engine to draw your UI on a Skia canvas, with gestures and animations, designed to draw pixel-perfect custom controls instead of using native ones, powered by [SkiaSharp](https://github.com/mono/SkiaSharp)😍. 
 Create and render your custom controls on a hardware-accelerated Skia canvas with an improved common MAUI layout system.
 
+**IMPORTANT UPDATE**
+Reverted SkiaSharp from 2.88.9 to 2.88.9-preview.2.2 
+until [scaling issue](https://github.com/taublast/DrawnUi.Maui/issues/130) is solved for Windows 
+
 Supports **iOS**, **MacCatalyst**, **Android**, **Windows**.
 
 * To use inside a usual MAUI app, consume drawn controls here and there inside `Canvas` views.
@@ -103,18 +107,16 @@ V3 preview: subclassed `SkiaShaderEffect`, implementing `ISkiaGestureProcessor`,
 
 ## What's New
 
-* Nuget 1.2.9.1 stable for SkiaSharp 2.88.9
-* Pdf helper added
-* Sandbox adapted, added example for multi-page pdf
-* SkiaImageManager fix for non-loading images
-* SkiaImage speed up loading from cached images
-* ContentLayout changed to skialayout fixing padding and margin problem
-* SkiaLayout invalidation and some others fixes
-* SkiaSlider wrong initial position fix
-* Gestures nuget updated
-* Added FluentExtensions
-* Another SkiaScroll fix for RefreshView 
-* Fix crash when disposing from different threads
+### Nuget 1.2.9.2  
+for SkiaSharp 2.88.9-preview.2.2 
+
+* Reverted SkiaSharp to 2.88.9-preview.2.2 back from 2.88.9
+until [scaling issue](https://github.com/taublast/DrawnUi.Maui/issues/130) is solved for Windows 
+* Antialiasing [issue](https://github.com/taublast/DrawnUi.Maui/issues/122) solved for SkiaShape
+* SkiaImageManager cancelling loads fix
+* Fixed native crash when using Super.ReuseBitmaps
+* SkiaSvg made more GC-friendly
+* Added `WithParent` to FluentExtensions
 * Some more
 
  ## Development Notes

diff --git a/dev/DrawnUi.Maui-dev.sln b/dev/DrawnUi.Maui-dev.sln
@@ -10,7 +10,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		movenugets.bat = movenugets.bat
 		nuget_uploadnugets.bat = nuget_uploadnugets.bat
 		..\README.md = ..\README.md
-		..\src\ToDo.txt = ..\src\ToDo.txt
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DrawnUi.Maui", "..\src\Engine\DrawnUi.Maui.csproj", "{D76B6239-94A0-482C-A0FF-A764017B7393}"

diff --git a/dev/github_uploadnugets.bat b/dev/github_uploadnugets.bat
@@ -13,8 +13,8 @@ REM Define the source directory for the packages
 set "source_dir=E:\Nugets"
 
 REM Define the list of file masks for the packages
-set "mask[1]=DrawnUi.Maui*.1.2.9.1*.nupkg"
-set "mask[2]=AppoMobi.Maui.DrawnUi.1.2.9.1*.*nupkg"
+set "mask[1]=DrawnUi.Maui*.1.2.9.2*.nupkg"
+set "mask[2]=AppoMobi.Maui.DrawnUi.1.2.9.2*.*nupkg"
 set "mask_count=2"
 
 REM Loop through each file mask

diff --git a/dev/nuget_uploadnugets.bat b/dev/nuget_uploadnugets.bat
@@ -13,8 +13,8 @@ REM Define the source directory for the packages
 set "source_dir=E:\Nugets"
 
 REM Define the list of file masks for the packages
-set "mask[1]=DrawnUi.Maui*.1.2.9.1*.nupkg"
-set "mask[2]=AppoMobi.Maui.DrawnUi.1.2.9.1*.*nupkg"
+set "mask[1]=DrawnUi.Maui*.1.2.9.2*.nupkg"
+set "mask[2]=AppoMobi.Maui.DrawnUi.1.2.9.2*.*nupkg"
 set "mask_count=2"
 
 REM Loop through each file mask

diff --git a/src/Addons/DrawnUi.Maui.Camera/DrawnUi.Maui.Camera.csproj b/src/Addons/DrawnUi.Maui.Camera/DrawnUi.Maui.Camera.csproj
@@ -44,7 +44,7 @@
 
     <!--production-->
   <ItemGroup Condition="'$(UseNuget)' == 'true'">
-    <PackageReference Include="AppoMobi.Maui.DrawnUi" Version="1.2.9.1" />
+    <PackageReference Include="AppoMobi.Maui.DrawnUi" Version="1.2.9.2" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Addons/DrawnUi.Maui.Game/DrawnUi.Maui.Game.csproj b/src/Addons/DrawnUi.Maui.Game/DrawnUi.Maui.Game.csproj
@@ -42,7 +42,7 @@
 
   <!--production-->
   <ItemGroup Condition="'$(UseNuget)' == 'true'">
-    <PackageReference Include="AppoMobi.Maui.DrawnUi" Version="1.2.9.1" />
+    <PackageReference Include="AppoMobi.Maui.DrawnUi" Version="1.2.9.2" />
   </ItemGroup>
 
 

diff --git a/src/Addons/DrawnUi.Maui.MapsUi/src/DrawnUi.Maui.MapsUi.csproj b/src/Addons/DrawnUi.Maui.MapsUi/src/DrawnUi.Maui.MapsUi.csproj
@@ -54,7 +54,7 @@
 
   <!--production-->
   <ItemGroup Condition="'$(UseNuget)' == 'true'">
-    <PackageReference Include="AppoMobi.Maui.DrawnUi" Version="1.2.9.1" />
+    <PackageReference Include="AppoMobi.Maui.DrawnUi" Version="1.2.9.2" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Addons/DrawnUi.Maui.Rive/DrawnUi.Maui.Rive.csproj b/src/Addons/DrawnUi.Maui.Rive/DrawnUi.Maui.Rive.csproj
@@ -47,7 +47,7 @@
 
   <!--production-->
   <ItemGroup Condition="'$(UseNuget)' == 'true'">
-    <PackageReference Include="AppoMobi.Maui.DrawnUi" Version="1.2.9.1" />
+    <PackageReference Include="AppoMobi.Maui.DrawnUi" Version="1.2.9.2" />
   </ItemGroup>
 
 

diff --git a/src/Addons/DrawnUi.MauiGraphics/DrawnUi.MauiGraphics.csproj b/src/Addons/DrawnUi.MauiGraphics/DrawnUi.MauiGraphics.csproj
@@ -41,7 +41,7 @@
 
   <!--production-->
   <ItemGroup Condition="'$(UseNuget)' == 'true'">
-    <PackageReference Include="AppoMobi.Maui.DrawnUi" Version="1.2.9.1" />
+    <PackageReference Include="AppoMobi.Maui.DrawnUi" Version="1.2.9.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -5,7 +5,7 @@
 
   <PropertyGroup Condition="'$(UseSkiaSharp3)' != 'true'">
     <PackageReleaseNotes>Using SkiaSharp 2.xx. Checkout the DrawnUi Sandbox project for usage example.</PackageReleaseNotes>
-    <Version>1.2.9.1</Version>
+    <Version>1.2.9.2</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(UseSkiaSharp3)' == 'true'">

diff --git a/src/Engine/Draw/Base/SkiaControl.Shared.cs b/src/Engine/Draw/Base/SkiaControl.Shared.cs
@@ -35,6 +35,8 @@ public SkiaControl()
             Init();
         }
 
+        protected static SKBlendMode DefaultBlendMode = SKBlendMode.SrcOver;
+
         public virtual bool IsVisibleInViewTree()
         {
             var isVisible = IsVisible && !IsDisposed;
@@ -3436,6 +3438,9 @@ void PostProcessMeasuredChild(ScaledSize measured, SkiaControl child, bool ignor
         /// <param name="context"></param>
         public virtual void SetInheritedBindingContext(object context)
         {
+            if (IsDisposing)
+                return;
+
             BindingContext = context;
         }
 
@@ -3444,7 +3449,10 @@ public virtual void SetInheritedBindingContext(object context)
         /// </summary>
         public virtual void ApplyBindingContext()
         {
-            foreach (var content in this.Views)
+            if (IsDisposing)
+                return;
+
+            foreach (var content in this.Views.ToList())
             {
                 content.SetInheritedBindingContext(BindingContext);
             }
@@ -3461,6 +3469,9 @@ public virtual void ApplyBindingContext()
         /// </summary>
         protected override void OnBindingContextChanged()
         {
+            if (IsDisposing)
+                return;
+
             BindingContextWasSet = true;
 
             try

diff --git a/src/Engine/Draw/Images/LoadedImageSource.cs b/src/Engine/Draw/Images/LoadedImageSource.cs
@@ -14,18 +14,28 @@ public LoadedImageSource Clone()
             // Clone the SKBitmap
             var bitmapClone = new SKBitmap(Bitmap.Width, Bitmap.Height, Bitmap.ColorType, Bitmap.AlphaType);
             Bitmap.CopyTo(bitmapClone);
-            return new LoadedImageSource(bitmapClone);
+            return new LoadedImageSource(bitmapClone)
+            {
+                ProtectBitmapFromDispose = this.ProtectBitmapFromDispose,
+                ProtectFromDispose = this.ProtectFromDispose
+            };
         }
         else if (Image != null)
         {
             // Clone the SKImage
             var imageClone = SKImage.FromBitmap(SKBitmap.FromImage(Image));
-            return new LoadedImageSource(imageClone);
+            return new LoadedImageSource(imageClone)
+            {
+                ProtectFromDispose = this.ProtectFromDispose
+            };
         }
         else
         {
             // If there's no image or bitmap, return a new empty instance
-            return new LoadedImageSource();
+            return new LoadedImageSource()
+            {
+                ProtectFromDispose = this.ProtectFromDispose
+            };
         }
     }
 
@@ -36,14 +46,23 @@ public LoadedImageSource Clone()
     /// </summary>
     public bool ProtectFromDispose { get; set; }
 
+    /// <summary>
+    /// Should be set to true for loaded with SkiaImageManager.ReuseBitmaps
+    /// </summary>
+    public bool ProtectBitmapFromDispose { get; set; }
+
     public void Dispose()
     {
         if (!IsDisposed && !ProtectFromDispose)
         {
             IsDisposed = true;
 
-            Bitmap?.Dispose();
+            if (!ProtectBitmapFromDispose)
+            {
+                Bitmap?.Dispose();
+            }
             Bitmap = null;
+
             Image?.Dispose();
             Image = null;
         }

diff --git a/src/Engine/Draw/Images/SkiaImage.cs b/src/Engine/Draw/Images/SkiaImage.cs
@@ -33,7 +33,7 @@ protected virtual LoadedImageSource SetImage(LoadedImageSource loaded)
         if (kill != null)
         {
             if (SkiaImageManager.ReuseBitmaps)
-                kill.Bitmap = null; //do not dispose shared cached image
+                kill.ProtectBitmapFromDispose = true; //do not dispose shared cached image
             DisposeObject(kill);
         }
 
@@ -322,7 +322,10 @@ public void SetFromBase64(string input)
 
         var bitmap = SKBitmap.Decode(pixelArray);
 
-        ImageBitmap = new LoadedImageSource(bitmap);
+        ImageBitmap = new LoadedImageSource(bitmap)
+        {
+            ProtectBitmapFromDispose = SkiaImageManager.ReuseBitmaps
+        };
         //SetImage(new InstancedBitmap(bitmap));
     }
 
@@ -360,15 +363,17 @@ public LoadedImageSource SetBitmapInternal(SKBitmap bitmap, bool protectFromDisp
     {
         return SetImage(new LoadedImageSource(bitmap)
         {
-            ProtectFromDispose = protectFromDispose
+            ProtectFromDispose = protectFromDispose,
+            ProtectBitmapFromDispose = SkiaImageManager.ReuseBitmaps
         });
     }
 
     public LoadedImageSource SetImageInternal(SKImage image, bool protectFromDispose = false)
     {
         return SetImage(new LoadedImageSource(image)
         {
-            ProtectFromDispose = protectFromDispose
+            ProtectFromDispose = protectFromDispose,
+            ProtectBitmapFromDispose = SkiaImageManager.ReuseBitmaps
         });
     }
 
@@ -451,7 +456,10 @@ public virtual void SetImageSource(ImageSource source)
                     var cachedBitmap = SkiaImageManager.Instance.GetFromCache(uri);
                     if (cachedBitmap != null)
                     {
-                        ImageBitmap = new LoadedImageSource(cachedBitmap);
+                        ImageBitmap = new LoadedImageSource(cachedBitmap)
+                        {
+                            ProtectBitmapFromDispose = SkiaImageManager.ReuseBitmaps
+                        };
                         OnSuccess?.Invoke(this, new ContentLoadedEventArgs(uri));
                         return;
                     }
@@ -518,7 +526,10 @@ async Task LoadAction()
                                     if (bitmap != null)
                                     {
                                         CancelLoading?.Cancel();
-                                        ImageBitmap = new LoadedImageSource(bitmap); //at the end will use SetImage(new InstancedBitmap(bitmap));
+                                        ImageBitmap = new LoadedImageSource(bitmap)
+                                        {
+                                            ProtectBitmapFromDispose = SkiaImageManager.ReuseBitmaps
+                                        }; //at the end will use SetImage(new InstancedBitmap(bitmap));
                                         TraceLog($"[SkiaImage] Loaded {source}");
                                         OnSuccess?.Invoke(this, new ContentLoadedEventArgs(url));
                                         OnSourceSuccess();
@@ -1036,6 +1047,7 @@ protected override void Paint(SkiaDrawingContext ctx, SKRect destination, float
                 ImagePaint = new()
                 {
                     IsAntialias = true,
+                    IsDither = IsDistorted,
                     FilterQuality = SKFilterQuality.High
                 };
             }

diff --git a/src/Engine/Draw/Layout/SkiaLayout.Grid.Structure.cs b/src/Engine/Draw/Layout/SkiaLayout.Grid.Structure.cs
@@ -7,13 +7,18 @@ namespace DrawnUi.Maui.Draw;
 
 public static class FluentExtensions
 {
-
     public static T With<T>(this T view, Action<T> action) where T : SkiaControl
     {
         action?.Invoke(view);
         return view;
     }
 
+    public static T WithParent<T>(this T view, IDrawnBase parent) where T : SkiaControl
+    {
+        parent.AddSubView(view);
+        return view;
+    }
+
     public static T CenterX<T>(this T view) where T : SkiaControl
     {
         view.HorizontalOptions = LayoutOptions.Center;

diff --git a/src/Engine/Draw/SkiaShape.cs b/src/Engine/Draw/SkiaShape.cs
@@ -533,17 +533,10 @@ protected override void Paint(SkiaDrawingContext ctx, SKRect destination, float
 
             RenderingPaint ??= new SKPaint()
             {
-                //IsAntialias = true,
+                IsAntialias = true
             };
 
-            //if (IsDistorted)
-            //{
-            //    RenderingPaint.FilterQuality = SKFilterQuality.Medium;
-            //}
-            //else
-            //{
-            //    RenderingPaint.FilterQuality = SKFilterQuality.None;
-            //}
+            RenderingPaint.IsDither = IsDistorted;
 
             if (BackgroundColor != null)
             {