canvas auto-size fix and some more

taublast · Aug 21, 2024 · d7befdc · d7befdc
1 parent fc297a3
commit d7befdc
Show file tree

Hide file tree

Showing 10 changed files with 1,670 additions and 1,631 deletions.
diff --git a/src/Addons/DrawnUi.Maui.Camera/SkiaCamera.cs b/src/Addons/DrawnUi.Maui.Camera/SkiaCamera.cs
@@ -1506,17 +1506,17 @@ public double ZoomLimitMax
         set { SetValue(ZoomLimitMaxProperty, value); }
     }
 
-    public static readonly BindableProperty BlackColorProperty = BindableProperty.Create(
-        nameof(BlackColor),
-        typeof(Color),
-        typeof(SkiaCamera),
-        Colors.Black);
+    //public static readonly BindableProperty BlackColorProperty = BindableProperty.Create(
+    //    nameof(BlackColor),
+    //    typeof(Color),
+    //    typeof(SkiaCamera),
+    //    Colors.Black);
 
-    public Color BlackColor
-    {
-        get { return (Color)GetValue(BlackColorProperty); }
-        set { SetValue(BlackColorProperty, value); }
-    }
+    //public Color BlackColor
+    //{
+    //    get { return (Color)GetValue(BlackColorProperty); }
+    //    set { SetValue(BlackColorProperty, value); }
+    //}
 
     private static void NeedSetZoom(BindableObject bindable, object oldvalue, object newvalue)
     {
@@ -1536,17 +1536,17 @@ private static void NeedSetZoom(BindableObject bindable, object oldvalue, object
         }
     }
 
-    public static readonly BindableProperty WhiteColorProperty = BindableProperty.Create(
-        nameof(WhiteColor),
-        typeof(Color),
-        typeof(SkiaCamera),
-        Colors.White);
+    //public static readonly BindableProperty WhiteColorProperty = BindableProperty.Create(
+    //    nameof(WhiteColor),
+    //    typeof(Color),
+    //    typeof(SkiaCamera),
+    //    Colors.White);
 
-    public Color WhiteColor
-    {
-        get { return (Color)GetValue(WhiteColorProperty); }
-        set { SetValue(WhiteColorProperty, value); }
-    }
+    //public Color WhiteColor
+    //{
+    //    get { return (Color)GetValue(WhiteColorProperty); }
+    //    set { SetValue(WhiteColorProperty, value); }
+    //}
 
     public static readonly BindableProperty DisplayModeProperty = BindableProperty.Create(
         nameof(DisplayMode),

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.3.7</Version>
+    <Version>1.2.3.8</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(UseSkiaSharp3)' == 'true'">

diff --git a/src/Engine/Draw/Layout/SkiaLayout.ViewsAdapter.cs b/src/Engine/Draw/Layout/SkiaLayout.ViewsAdapter.cs
@@ -451,6 +451,12 @@ bool CheckTemplateChanged()
 					AddedMore = 0;
 				}
 
+				if (dataContexts.Count == 0)
+				{
+					TemplatesAvailable();
+					return;
+				}
+
 				if (_parent.InitializeTemplatesInBackgroundDelay > 0)
 				{
 					//postpone initialization to be executed in background

diff --git a/src/Engine/Draw/Layout/SkiaLayout.cs b/src/Engine/Draw/Layout/SkiaLayout.cs
@@ -836,7 +836,8 @@ public override ScaledSize Measure(float widthConstraint, float heightConstraint
 
 					if (IsTemplated)
 					{
-						if (ChildrenFactory.TemplatesInvalidated && !ChildrenFactory.TemplesInvalidating)
+						if (ChildrenFactory.TemplatesInvalidated
+						&& !ChildrenFactory.TemplesInvalidating)
 						{
 							ChildrenFactory.TemplesInvalidating = true;
 							ApplyNewItemsSource = false;