1.2.9.4

* SkiaShape new Types: Polygon and Line. New property for their Points: Smooth (0-1) to smooth angles. * Shapes demo page inside SandBox project. * VisualElement Shadow property now supported everywhere as an optional addition to existing shadows. * Removed SkiaImage clipping to better support shadows. * SkiaLabel new property AutoFont: Find and set system font where the first glyph in text is present. Useful for some quick unicode rendering like emoji etc. * Updated Getsures nuget for correct lock inside MAUI native ScrollView, use Getures="Lock" for Canvas. * Fixed controls sometimes not invalidated when canvas suface size changes * Other fixes.
taublast · Nov 24, 2024 · 67e9512 · 67e9512
1 parent 614a90b
commit 67e9512
Show file tree

Hide file tree

Showing 26 changed files with 553 additions and 373 deletions.
diff --git a/README.md b/README.md
@@ -103,17 +103,17 @@ V3 preview: subclassed `SkiaShaderEffect`, implementing `ISkiaGestureProcessor`,
 
 ## What's New
 
-### Nuget 1.2.9.2  
+### Nuget 1.2.9.4
 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
+* SkiaShape new Types: Polygon and Line. New property for their Points: Smooth (0-1) to smooth angles.
+* Shapes demo page inside SandBox project.
+* VisualElement Shadow property now supported everywhere as an optional addition to existing shadows. 
+* Removed SkiaImage clipping to better support shadows.
+* SkiaLabel new property AutoFont: Find and set system font where the first glyph in text is present. Useful for some quick unicode rendering like emoji etc.
+* Updated Getsures nuget for correct lock inside MAUI native ScrollView, use Getures="Lock" for Canvas.
+* Fixed controls sometimes not invalidated when canvas suface size changes
+* Other fixes.
 
  ## Development Notes
 

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.2*.nupkg"
-set "mask[2]=AppoMobi.Maui.DrawnUi.1.2.9.2*.*nupkg"
+set "mask[1]=DrawnUi.Maui*.1.2.9.4*.nupkg"
+set "mask[2]=AppoMobi.Maui.DrawnUi.1.2.9.4*.*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.2*.nupkg"
-set "mask[2]=AppoMobi.Maui.DrawnUi.1.2.9.2*.*nupkg"
+set "mask[1]=DrawnUi.Maui*.1.2.9.4*.nupkg"
+set "mask[2]=AppoMobi.Maui.DrawnUi.1.2.9.4*.*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.2" />
+    <PackageReference Include="AppoMobi.Maui.DrawnUi" Version="1.2.9.4" />
   </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.2" />
+    <PackageReference Include="AppoMobi.Maui.DrawnUi" Version="1.2.9.4" />
   </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.2" />
+    <PackageReference Include="AppoMobi.Maui.DrawnUi" Version="1.2.9.4" />
   </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.2" />
+    <PackageReference Include="AppoMobi.Maui.DrawnUi" Version="1.2.9.4" />
   </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.2" />
+    <PackageReference Include="AppoMobi.Maui.DrawnUi" Version="1.2.9.4" />
   </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.2</Version>
+    <Version>1.2.9.4</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(UseSkiaSharp3)' == 'true'">

diff --git a/src/Engine/Draw/Base/SkiaControl.Shared.cs b/src/Engine/Draw/Base/SkiaControl.Shared.cs
@@ -4648,7 +4648,9 @@ protected virtual void ApplyTransforms(SkiaDrawingContext ctx, SKRect destinatio
                 Helper3d.RotateYDegrees((float)RotationY);
                 Helper3d.RotateZDegrees(-(float)RotationZ);
                 Helper3d.TranslateZ((float)TranslationZ);
+
                 drawingMatrix = drawingMatrix.PostConcat(Helper3d.Matrix);
+
                 Helper3d.Restore();
 #endif
 

diff --git a/src/Engine/Draw/Layout/SkiaLayout.Grid.cs b/src/Engine/Draw/Layout/SkiaLayout.Grid.cs
@@ -1,7 +1,7 @@
 //Adapted code from the Xamarin.Forms Grid implementation
 
-using DrawnUi.Maui.Infrastructure.Xaml;
 using System.ComponentModel;
+using DrawnUi.Maui.Infrastructure.Xaml;
 
 namespace DrawnUi.Maui.Draw;
 
@@ -12,6 +12,7 @@ public partial class SkiaLayout
 
     public virtual ScaledSize MeasureGrid(SKRect rectForChildrenPixels, float scale)
     {
+        //Trace.WriteLine($"MeasureGrid inside {rectForChildrenPixels}");
 
         var constraints = GetSizeInPoints(rectForChildrenPixels.Size, scale);
 
@@ -65,6 +66,7 @@ protected virtual int DrawChildrenGrid(SkiaDrawingContext context, SKRect destin
 
             List<SkiaControlWithRect> tree = new();
 
+            var cellIndex = 0;
             foreach (var child in cells)
             {
                 child.OptionalOnBeforeDrawing(); //could set IsVisible or whatever inside
@@ -76,6 +78,8 @@ protected virtual int DrawChildrenGrid(SkiaDrawingContext context, SKRect destin
                 var cell = GridStructure.GetCellBoundsFor(child, (destination.Left / scale),
                     (destination.Top / scale));
 
+                //Trace.WriteLine($"cell {cellIndex++} rect {cell}");
+
                 //GetCellBoundsFor is in pixels
                 SKRect cellRect = new((float)Math.Round(cell.Left * scale), (float)Math.Round(cell.Top * scale),
                     (float)Math.Round(cell.Right * scale), (float)Math.Round(cell.Bottom * scale));
@@ -335,4 +339,4 @@ protected void UpdateRowColumnBindingContexts()
 
     #endregion
 
-}
+}