1
0
Эх сурвалжийг харах

fix(ControlCatalog): Address Rule AVP1000 Incorrect AvaloniaProperty storage

Giuseppe Lippolis 2 жил өмнө
parent
commit
27c9acfd6c

+ 4 - 4
samples/ControlCatalog/Pages/CustomDrawingExampleControl.cs

@@ -16,10 +16,10 @@ namespace ControlCatalog.Pages
         private Point _cursorPoint;
         private Point _cursorPoint;
 
 
 
 
-        public StyledProperty<double> ScaleProperty = AvaloniaProperty.Register<CustomDrawingExampleControl, double>(nameof(Scale), 1.0d);
+        public static readonly StyledProperty<double> ScaleProperty = AvaloniaProperty.Register<CustomDrawingExampleControl, double>(nameof(Scale), 1.0d);
         public double Scale { get => GetValue(ScaleProperty); set => SetValue(ScaleProperty, value); }
         public double Scale { get => GetValue(ScaleProperty); set => SetValue(ScaleProperty, value); }
 
 
-        public StyledProperty<double> RotationProperty = AvaloniaProperty.Register<CustomDrawingExampleControl, double>(nameof(Rotation));
+        public static readonly StyledProperty<double> RotationProperty = AvaloniaProperty.Register<CustomDrawingExampleControl, double>(nameof(Rotation));
         /// <summary>
         /// <summary>
         /// Rotation, measured in Radians!
         /// Rotation, measured in Radians!
         /// </summary>
         /// </summary>
@@ -33,10 +33,10 @@ namespace ControlCatalog.Pages
             }
             }
         }
         }
 
 
-        public StyledProperty<double> ViewportCenterYProperty = AvaloniaProperty.Register<CustomDrawingExampleControl, double>(nameof(ViewportCenterY), 0.0d);
+        public static readonly StyledProperty<double> ViewportCenterYProperty = AvaloniaProperty.Register<CustomDrawingExampleControl, double>(nameof(ViewportCenterY), 0.0d);
         public double ViewportCenterY { get => GetValue(ViewportCenterYProperty); set => SetValue(ViewportCenterYProperty, value); }
         public double ViewportCenterY { get => GetValue(ViewportCenterYProperty); set => SetValue(ViewportCenterYProperty, value); }
 
 
-        public StyledProperty<double> ViewportCenterXProperty = AvaloniaProperty.Register<CustomDrawingExampleControl, double>(nameof(ViewportCenterX), 0.0d);
+        public static readonly StyledProperty<double> ViewportCenterXProperty = AvaloniaProperty.Register<CustomDrawingExampleControl, double>(nameof(ViewportCenterX), 0.0d);
         public double ViewportCenterX { get => GetValue(ViewportCenterXProperty); set => SetValue(ViewportCenterXProperty, value); }
         public double ViewportCenterX { get => GetValue(ViewportCenterXProperty); set => SetValue(ViewportCenterXProperty, value); }
 
 
         private IPen _pen;
         private IPen _pen;

+ 3 - 3
samples/ControlCatalog/Pages/PointerCanvas.cs

@@ -93,7 +93,7 @@ public class PointerCanvas : Control
     }
     }
 
 
     private int _threadSleep;
     private int _threadSleep;
-    public static DirectProperty<PointerCanvas, int> ThreadSleepProperty =
+    public static readonly DirectProperty<PointerCanvas, int> ThreadSleepProperty =
         AvaloniaProperty.RegisterDirect<PointerCanvas, int>(nameof(ThreadSleep), c => c.ThreadSleep, (c, v) => c.ThreadSleep = v);
         AvaloniaProperty.RegisterDirect<PointerCanvas, int>(nameof(ThreadSleep), c => c.ThreadSleep, (c, v) => c.ThreadSleep = v);
 
 
     public int ThreadSleep
     public int ThreadSleep
@@ -103,7 +103,7 @@ public class PointerCanvas : Control
     }
     }
 
 
     private bool _drawOnlyPoints;
     private bool _drawOnlyPoints;
-    public static DirectProperty<PointerCanvas, bool> DrawOnlyPointsProperty =
+    public static readonly DirectProperty<PointerCanvas, bool> DrawOnlyPointsProperty =
         AvaloniaProperty.RegisterDirect<PointerCanvas, bool>(nameof(DrawOnlyPoints), c => c.DrawOnlyPoints, (c, v) => c.DrawOnlyPoints = v);
         AvaloniaProperty.RegisterDirect<PointerCanvas, bool>(nameof(DrawOnlyPoints), c => c.DrawOnlyPoints, (c, v) => c.DrawOnlyPoints = v);
 
 
     public bool DrawOnlyPoints
     public bool DrawOnlyPoints
@@ -113,7 +113,7 @@ public class PointerCanvas : Control
     }
     }
 
 
     private string? _status;
     private string? _status;
-    public static DirectProperty<PointerCanvas, string?> StatusProperty =
+    public static readonly DirectProperty<PointerCanvas, string?> StatusProperty =
         AvaloniaProperty.RegisterDirect<PointerCanvas, string?>(nameof(DrawOnlyPoints), c => c.Status, (c, v) => c.Status = v,
         AvaloniaProperty.RegisterDirect<PointerCanvas, string?>(nameof(DrawOnlyPoints), c => c.Status, (c, v) => c.Status = v,
             defaultBindingMode: Avalonia.Data.BindingMode.TwoWay);
             defaultBindingMode: Avalonia.Data.BindingMode.TwoWay);