Merge pull request #237 from Thecentury/transform-comparison

Transform comparison
fsprojects · Jan 26, 2023 · e77b874 · e77b874
2 parents c3a8407 + 19bcb61
commit e77b874
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/src/Avalonia.FuncUI/DSL/Base/Visual.fs b/src/Avalonia.FuncUI/DSL/Base/Visual.fs
@@ -4,6 +4,7 @@ namespace Avalonia.FuncUI.DSL
 module Visual =  
     open Avalonia
     open Avalonia.Media
+    open Avalonia.FuncUI
     open Avalonia.FuncUI.Types
     open Avalonia.FuncUI.Builder
 
@@ -25,7 +26,7 @@ module Visual =
             AttrBuilder<'t>.CreateProperty<IBrush>(Visual.OpacityMaskProperty, value, ValueNone)
 
         static member renderTransform<'t when 't :> Visual>(transform: ITransform) : IAttr<'t> =
-            AttrBuilder<'t>.CreateProperty<ITransform>(Visual.RenderTransformProperty, transform, ValueNone)
+            AttrBuilder<'t>.CreateProperty<ITransform>(Visual.RenderTransformProperty, transform, ValueSome EqualityComparers.compareTransforms)
 
         static member renderTransformOrigin<'t when 't :> Visual>(origin: RelativePoint) : IAttr<'t> =
             AttrBuilder<'t>.CreateProperty<RelativePoint>(Visual.RenderTransformOriginProperty, origin, ValueNone)

diff --git a/src/Avalonia.FuncUI/DSL/LayoutTransformControl.fs b/src/Avalonia.FuncUI/DSL/LayoutTransformControl.fs
@@ -4,6 +4,7 @@
 module LayoutTransformControl =
     open Avalonia.Media
     open Avalonia.Controls
+    open Avalonia.FuncUI
     open Avalonia.FuncUI.Types
     open Avalonia.FuncUI.Builder
 
@@ -12,7 +13,7 @@ module LayoutTransformControl =
 
     type LayoutTransformControl with
         static member layoutTransform<'t when 't :> LayoutTransformControl>(value: ITransform) : IAttr<'t> =
-            AttrBuilder<'t>.CreateProperty<ITransform>(LayoutTransformControl.LayoutTransformProperty, value, ValueNone)
+            AttrBuilder<'t>.CreateProperty<ITransform>(LayoutTransformControl.LayoutTransformProperty, value, ValueSome EqualityComparers.compareTransforms)
 
         static member useRenderTransform<'t when 't :> LayoutTransformControl>(value: bool) : IAttr<'t> =
             AttrBuilder<'t>.CreateProperty<bool>(LayoutTransformControl.UseRenderTransformProperty, value, ValueNone)
diff --git a/src/Avalonia.FuncUI/Helpers.fs b/src/Avalonia.FuncUI/Helpers.fs
@@ -17,4 +17,13 @@ module AvaloniaExtensions =
         member this.Load (source: string) = 
             let style = StyleInclude(baseUri = null)
             style.Source <- Uri(source)
-            this.Add(style)
+            this.Add(style)
+
+module internal EqualityComparers =
+    open Avalonia.Media
+
+    let compareTransforms (t1: obj, t2: obj) =
+        match t1, t2 with
+        | :? ITransform as t1, (:? ITransform as t2) when t1.GetType() = t2.GetType() ->
+            t1.Value.Equals(t2.Value)
+        | _ -> false
diff --git a/src/Examples/Component Examples/Examples.Presso/Program.fs b/src/Examples/Component Examples/Examples.Presso/Program.fs
@@ -1,13 +1,10 @@
 namespace Examples.Presso
 
-open Elmish
 open Avalonia
 open Avalonia.Controls.ApplicationLifetimes
 open Avalonia.Themes.Fluent
 open Avalonia.FuncUI
-open Avalonia.FuncUI.Elmish
 open Avalonia.FuncUI.Hosts
-open Avalonia.Media
 
 type MainWindow() as this =
     inherit HostWindow()