Move reload invalidation

wieslawsoltes · Jan 26, 2024 · 6090b70 · 6090b70
1 parent cc86ed8
commit 6090b70
Showing 1 changed file with 21 additions and 6 deletions.
diff --git a/src/Avalonia.Svg.Skia/SvgImage.cs b/src/Avalonia.Svg.Skia/SvgImage.cs
@@ -64,12 +64,6 @@ void IImage.Draw(DrawingContext context, Rect sourceRect, Rect destRect)
     {
         var source = Source;
 
-		var style = string.Concat(Style, ' ', CurrentStyle);
-        if (source?.Parameters?.Style != style)
-        {
-            source?.ReLoad(new SvgParameters(null, style));
-        }
-
         if (source?.Picture is null)
         {
             return;
@@ -101,9 +95,30 @@ void IImage.Draw(DrawingContext context, Rect sourceRect, Rect destRect)
     protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
     {
         base.OnPropertyChanged(change);
+
         if (change.Property == SourceProperty)
         {
             // TODO: Invalidate IImage
         }
+
+        if (change.Property == StyleProperty)
+        {
+            var style = string.Concat(Style, ' ', CurrentStyle);
+
+            if (Source?.Parameters?.Style != style)
+            {
+                Source?.ReLoad(new SvgParameters(null, style));
+            }
+        }
+
+        if (change.Property == CurrentStyleProperty)
+        {
+            var style = string.Concat(Style, ' ', CurrentStyle);
+
+            if (Source?.Parameters?.Style != style)
+            {
+                Source?.ReLoad(new SvgParameters(null, style));
+            }
+        }
     }
 }