1.2.3.6

README.md

@@ -16,14 +16,11 @@ https://github.com/taublast/DrawnUi.Maui/assets/25801194/3b360229-ce3b-4d33-a85b
 
 ## What's new
 
-* `SkiaScroll` fixed scrolling vertically + horizontally at the same time (`Orientation="Both"`).
-* `SkiaShell` Navigated and Navigating events now report popups too.
-* `SkiaMediaImage` a subclassed `SkiaImage` for displaying any kind of images (image/animated gif/more..)
-* `SkiaGif` a dedicated lightweight GIF-player with playback control properties. See Sandbox project.
-* Fixed gestures inside `ImageCacheComposite` cache. 
-* Fixed bug `SkiaShell` navigation gets locked when spamming popups.
-* Layout optimizations.
-* Nuget 1.2.3.4
+* Breaking ``ISkiaCell`` changed, check out demo app FestCellWithBanner new usage.
+* Android loop changed along with its OpenGL renderer.
+* Gestures fix: will not trigger Tapped after raised Longpressing.
+* Other fixes.
+* Nuget 1.2.3.6
 
 ## Demo Apps
 
@@ -595,6 +592,15 @@ It will render a mask over its children when hovered, think of it as an inverted
 
 ## Previously
 
+* `SkiaScroll` fixed scrolling vertically + horizontally at the same time (`Orientation="Both"`).
+* `SkiaShell` Navigated and Navigating events now report popups too.
+* `SkiaMediaImage` a subclassed `SkiaImage` for displaying any kind of images (image/animated gif/more..)
+* `SkiaGif` a dedicated lightweight GIF-player with playback control properties. See Sandbox project.
+* Fixed gestures inside `ImageCacheComposite` cache. 
+* Fixed bug `SkiaShell` navigation gets locked when spamming popups.
+* Layout optimizations.
+* Nuget 1.2.3.4
+* 
 * `SkiaLayout` Column/Row uses 2 layout passes when needed, can now use full alignment  options inside.
 * Critical fixes for Release builds.
 

src/Addons/DrawnUi.Maui.Camera/DrawnUi.Maui.Camera.csproj

@@ -43,7 +43,7 @@
 
     <!--production-->
   <ItemGroup Condition="'$(UseNuget)' == 'true'">
-    <PackageReference Include="AppoMobi.Maui.DrawnUi" Version="1.2.3.4" />
+    <PackageReference Include="AppoMobi.Maui.DrawnUi" Version="1.2.3.6" />
   </ItemGroup>
 
 </Project>

src/Addons/DrawnUi.Maui.Camera/README.md

@@ -0,0 +1,4 @@
+
+Only Android is actually implemented.   
+
+When i have spare time, hopefully soon..

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.3.4" />
+    <PackageReference Include="AppoMobi.Maui.DrawnUi" Version="1.2.3.6" />
   </ItemGroup>
 
 

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.3.4" />
+    <PackageReference Include="AppoMobi.Maui.DrawnUi" Version="1.2.3.6" />
   </ItemGroup>
 
 </Project>

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.3.4" />
+    <PackageReference Include="AppoMobi.Maui.DrawnUi" Version="1.2.3.6" />
   </ItemGroup>
 
 

src/Addons/DrawnUi.MauiGraphics/DrawnUi.MauiGraphics.csproj

@@ -41,7 +41,7 @@
 
   <!--production-->
   <ItemGroup Condition="'$(UseNuget)' == 'true'">
-    <PackageReference Include="AppoMobi.Maui.DrawnUi" Version="1.2.3.4" />
+    <PackageReference Include="AppoMobi.Maui.DrawnUi" Version="1.2.3.6" />
   </ItemGroup>
 
   <ItemGroup>

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

src/Engine/Controls/Button/SkiaButton.cs

@@ -78,7 +78,7 @@ protected override void CreateDefaultContent()
     /// Clip effects with rounded rect of the frame inside
     /// </summary>
     /// <returns></returns>
-    public override SKPath CreateClip(object arguments, bool usePosition)
+    public override SKPath CreateClip(object arguments, bool usePosition, SKPath path = null)
     {
         if (MainFrame != null)
         {

src/Engine/Controls/Layouts/SkiaDecoratedGrid.cs

@@ -181,20 +181,28 @@ protected override void OnLayoutChanged()
         base.OnLayoutChanged();
 
         UpdateLines();
+    }
+
+    protected override void PostArrange(SKRect destination, float widthRequest, float heightRequest, float scale)
+    {
+        base.PostArrange(destination, widthRequest, heightRequest, scale);
 
+        if (ContainerLines == null)
+        {
+            CreateLines();
+        }
     }
 
     protected override void Draw(SkiaDrawingContext context, SKRect destination, float scale)
     {
         base.Draw(context, destination, scale);
 
-        //if (ContainerLines == null)
-        //{
-        //    CreateLines();
-        //}
+
 
         if (ContainerLines != null)
+        {
             ContainerLines.Render(context, GetDrawingRectForChildren(Destination, scale), scale);
+        }
 
         FinalizeDrawingWithRenderObject(context, scale);
     }

src/Engine/Controls/Pickers/ScrollPickerWheel.cs

@@ -176,7 +176,7 @@ protected override bool DrawChild(SkiaDrawingContext context, SKRect dest, ISkia
 
             var ret = base.DrawChild(context, dest, child, scale);
 
-            context.Canvas.Restore();
+            context.Canvas.RestoreToCount(saved);
 
             return true;
         }

src/Engine/Controls/PlayFrames/AnimatedFramesRenderer.cs

@@ -127,10 +127,15 @@ public void InitializeAnimator()
 
         OnAnimatorInitializing();
 
-        if (AutoPlay && CheckCanStartAnimator())
+        if (_delayedPlay || AutoPlay && CheckCanStartAnimator())
+        {
+            _delayedPlay = false;
             Start();
+        }
     }
 
+    bool _delayedPlay;
+
     protected virtual void OnAnimatorInitializing()
     { }
 
@@ -161,6 +166,13 @@ public void Seek(double frame)
 
     public virtual void Start(int delayMs = 0)
     {
+
+        if (Animator == null)
+        {
+            _delayedPlay = true;
+            return;
+        }
+
         if (Animator.IsRunning)
         {
             Animator.Stop();

src/Engine/Controls/Shapes/SkiaHoverMask.cs

@@ -26,7 +26,7 @@ protected override void Paint(SkiaDrawingContext ctx, SKRect destination, float
                     using var clipContent = CreateClip(arguments, true);
                     clipInsideParent.AddPath(clipContent);
 
-                    ctx.Canvas.ClipPath(clipInsideParent, SKClipOperation.Difference, true);
+                    ClipSmart(ctx.Canvas, clipInsideParent, SKClipOperation.Difference);
 
                     //paint this taking viewport dimensions
                     ctx.Canvas.DrawRect(Parent.DrawingRect, paint);
@@ -35,7 +35,7 @@ protected override void Paint(SkiaDrawingContext ctx, SKRect destination, float
 
                     //todo add stroke property?
 
-                    ctx.Canvas.Restore();
+                    ctx.Canvas.RestoreToCount(saved);
                 }
             }
 

src/Engine/Draw/Layout/SkiaLayout.ViewsAdapter.cs

@@ -86,10 +86,10 @@ public void MarkViewAsHidden(int index)
                 {
                     if (_dicoCellsInUse.TryGetValue(index, out SkiaControl hiddenView))
                     {
-                        if (hiddenView is ISkiaCell notify)
-                        {
-                            notify.OnDisappeared();
-                        }
+                        //if (hiddenView is ISkiaCell notify)
+                        //{
+                        //    notify.OnDisappeared();
+                        //}
 
                         _dicoCellsInUse.Remove(index);
                         ReleaseView(hiddenView);
@@ -248,10 +248,10 @@ public SkiaControl GetChildAt(int index, SkiaControl template = null)
 
                         //Debug.WriteLine($"[InUse] {_dicoCellsInUse.Keys.Select(k => k.ToString()).Aggregate((current, next) => $"{current},{next}")}");
 
-                        if (view is ISkiaCell notify)
-                        {
-                            notify.OnAppearing();
-                        }
+                        //if (view is ISkiaCell notify)
+                        //{
+                        //    notify.OnAppearing();
+                        //}
                     }
 
                     return view;

src/Engine/Draw/Layout/SkiaLayout.Wrap.cs

@@ -46,12 +46,12 @@ protected virtual int DrawStack(
 
                 //PASS 1 - VISIBILITY
                 //we need this pass before drawing to recycle views that became hidden
-                var viewsTotal = 0;
+                var currentIndex = -1;
                 foreach (var cell in structure.GetChildrenAsSpans())
                 {
-                    viewsTotal++;
-                    viewsTotal++;
-                    if (cell.Destination == SKRect.Empty)
+                    currentIndex++;
+
+                    if (cell.Destination == SKRect.Empty || cell.Measured.Pixels.IsEmpty)
                     {
                         cell.IsVisible = false;
                     }

src/Engine/Draw/Layout/SkiaLayout.cs

@@ -980,6 +980,10 @@ protected override void Paint(SkiaDrawingContext ctx, SKRect destination, float
             {
                 SetupRenderingWithComposition(ctx, destination);
             }
+            else
+            {
+                DirtyChildren.Clear();
+            }
 
             base.Paint(ctx, destination, scale, arguments);
 
@@ -993,16 +997,10 @@ protected override void Paint(SkiaDrawingContext ctx, SKRect destination, float
                 drawnChildrenCount = DrawViews(ctx, rectForChildren, scale);
             }
             else
-            //grid
             if (Type == LayoutType.Grid) //todo add optimization for OptimizeRenderingViewport
             {
                 drawnChildrenCount = DrawChildrenGrid(ctx, rectForChildren, scale);
             }
-            //else
-            //if (Type == LayoutType.Row || Type == LayoutType.Column)
-            //{
-            //    drawnChildrenCount = DrawChildrenStack(ctx, rectForChildren, scale);
-            //}
             else
             //stacklayout
             if (IsStack)
@@ -1288,23 +1286,14 @@ private static void ItemsSourcePropertyChanged(BindableObject bindable, object o
 
             }
 
-            //if (newvalue is IList newList)
-            //{
-            //	foreach (var context in newList)
-            //	{
-            //		//todo
-            //	}
-            //}
 
             if (newvalue is INotifyCollectionChanged newCollection)
             {
                 newCollection.CollectionChanged -= skiaControl.ItemsSourceCollectionChanged;
                 newCollection.CollectionChanged += skiaControl.ItemsSourceCollectionChanged;
             }
 
-            skiaControl.PostponeInvalidation(nameof(OnItemSourceChanged), skiaControl.OnItemSourceChanged);
-
-            //skiaControl.OnItemSourceChanged();
+            skiaControl.OnItemSourceChanged();
         }
 
         private static void NeedUpdateItemsSource(BindableObject bindable, object oldvalue, object newvalue)
@@ -1313,8 +1302,8 @@ private static void NeedUpdateItemsSource(BindableObject bindable, object oldval
 
             skiaControl.PostponeInvalidation(nameof(UpdateItemsSource), skiaControl.UpdateItemsSource);
 
-            //skiaControl.OnItemSourceChanged();
-            //skiaControl.Invalidate();
+            skiaControl.Update();
+
         }
 
         void UpdateItemsSource()
@@ -1326,8 +1315,8 @@ void UpdateItemsSource()
 
         public override void OnItemTemplateChanged()
         {
-            PostponeInvalidation(nameof(OnItemSourceChanged), OnItemSourceChanged);
-            //OnItemSourceChanged();
+            //PostponeInvalidation(nameof(OnItemSourceChanged), OnItemSourceChanged);
+            OnItemSourceChanged();
         }
 
         public bool ApplyNewItemsSource { get; set; }
@@ -1516,9 +1505,8 @@ protected virtual void ItemsSourceCollectionChanged(object sender, NotifyCollect
                     GetTemplatesPoolLimit(),
                     GetTemplatesPoolPrefill());
 
-                // Invalidate();
-
-                // return;
+                Invalidate();
+                return;
             }
 
             break;

src/Engine/Draw/Scroll/SkiaScroll.Scrolling.cs

@@ -486,6 +486,7 @@ void BounceX(float offsetFrom, float offsetTo, float velocity)
         if (displacement != 0)
         {
             var spring = new Spring((float)(1 * (1 + RubberDamping)), 200, (float)(0.5f * (1 + RubberDamping)));
+            _animatorFlingX.Stop();
             _vectorAnimatorBounceX.Initialize(offsetTo, displacement, velocity, spring);
             _vectorAnimatorBounceX.Start();
         }
@@ -505,6 +506,7 @@ void BounceY(float offsetFrom, float offsetTo, float velocity)
 
         if (displacement != 0)
         {
+            _animatorFlingY.Stop();
             var spring = new Spring((float)(1 * (1 + RubberDamping)), 200, (float)(0.5f * (1 + RubberDamping)));
             _vectorAnimatorBounceY.Initialize(offsetTo, displacement, velocity, spring);
             _vectorAnimatorBounceY.Start();

src/Engine/Draw/Scroll/SkiaScroll.cs

@@ -914,12 +914,14 @@ ISkiaGestureListener PassToChildren()
                                 if (Math.Abs(velocityX) > _minVelocity && !bounceX)
                                 {
                                     IsUserFocused = false;
+                                    _vectorAnimatorBounceX.Stop();
                                     fling = StartToFlingFrom(_animatorFlingX, ViewportOffsetX, velocityX);
                                 }
 
                                 if (Math.Abs(velocityY) > _minVelocity && !bounceY)
                                 {
                                     IsUserFocused = false;
+                                    _vectorAnimatorBounceY.Stop();
                                     fling = StartToFlingFrom(_animatorFlingY, ViewportOffsetY, velocityY);
                                 }
                             }
@@ -2615,17 +2617,20 @@ protected override void Draw(SkiaDrawingContext context, SKRect destination,
                 var posX = (float)Math.Round(ViewportOffsetX * _zoomedScale);
                 var posY = (float)Math.Round(ViewportOffsetY * _zoomedScale);
 
+                //var posX = (float)(ViewportOffsetX * _zoomedScale);
+                //var posY = (float)(ViewportOffsetY * _zoomedScale);
+
                 var needReposition =
                                      _updatedViewportForPixY != posY
                                  || _updatedViewportForPixX != posX
-                                 || _destination != Destination;
+                                 || _destination != destination;
 
                 //reposition viewport (scroll)
                 if (needReposition)
                 {
                     _updatedViewportForPixX = posX;
                     _updatedViewportForPixY = posY;
-                    _destination = Destination;
+                    _destination = destination;
 
                     PositionViewport(DrawingRect, new(posX, posY), _zoomedScale, (float)scale);
 

src/Engine/Draw/Scroll/SkiaScrollLooped.cs

@@ -368,7 +368,7 @@ protected override void OnDrawn(SkiaDrawingContext context,
 
                                 DrawViews(context, childRect, zoomedScale, debug);
 
-                                context.Canvas.Restore();
+                                context.Canvas.RestoreToCount(count);
                             }
                             else
                             {