Make Grid row/column definitions styleable

src/Avalonia.Controls/Grid.cs

@@ -23,16 +23,53 @@ public class Grid : Panel
     {
         static Grid()
         {
-            ShowGridLinesProperty.Changed.AddClassHandler<Grid>(OnShowGridLinesPropertyChanged);
+            ShowGridLinesProperty.Changed.AddClassHandler((Action<Grid, AvaloniaPropertyChangedEventArgs>)OnShowGridLinesPropertyChanged);
 
-            IsSharedSizeScopeProperty.Changed.AddClassHandler<Control>(DefinitionBase.OnIsSharedSizeScopePropertyChanged);
-            ColumnProperty.Changed.AddClassHandler<Control>(OnCellAttachedPropertyChanged);
-            ColumnSpanProperty.Changed.AddClassHandler<Control>(OnCellAttachedPropertyChanged);
-            RowProperty.Changed.AddClassHandler<Control>(OnCellAttachedPropertyChanged);
-            RowSpanProperty.Changed.AddClassHandler<Control>(OnCellAttachedPropertyChanged);
+            IsSharedSizeScopeProperty.Changed.AddClassHandler((Action<Control, AvaloniaPropertyChangedEventArgs>)DefinitionBase.OnIsSharedSizeScopePropertyChanged);
+            ColumnProperty.Changed.AddClassHandler((Action<Control, AvaloniaPropertyChangedEventArgs>)OnCellAttachedPropertyChanged);
+            ColumnSpanProperty.Changed.AddClassHandler((Action<Control, AvaloniaPropertyChangedEventArgs>)OnCellAttachedPropertyChanged);
+            RowProperty.Changed.AddClassHandler((Action<Control, AvaloniaPropertyChangedEventArgs>)OnCellAttachedPropertyChanged);
+            RowSpanProperty.Changed.AddClassHandler((Action<Control, AvaloniaPropertyChangedEventArgs>)OnCellAttachedPropertyChanged);
 
-            AffectsParentMeasure<Grid>(ColumnProperty, ColumnSpanProperty, RowProperty, RowSpanProperty);
+            AffectsParentMeasure<Grid>(ColumnProperty, ColumnSpanProperty, RowProperty, RowSpanProperty, ColumnDefinitionsProperty, RowDefinitionsProperty);
+            AffectsMeasure<Grid>(ColumnDefinitionsProperty, RowDefinitionsProperty);
+
+            RowDefinitionsProperty.Changed.AddClassHandler<Grid>(RowDefinitionsPropertyChanged);
+            ColumnDefinitionsProperty.Changed.AddClassHandler<Grid>(ColumnDefinitionsPropertyChanged);
+        }
+
+        private static void ColumnDefinitionsPropertyChanged(Grid arg1, AvaloniaPropertyChangedEventArgs arg2)
+        {
+            var val = arg2.NewValue as ColumnDefinitions;
+            ColumnDefinitionsPropertyChangedCore(arg1, val);
+        }
+
+        private static void ColumnDefinitionsPropertyChangedCore(Grid arg1, ColumnDefinitions arg2)
+        {
+            if (arg1._data is null)
+                arg1._data = new ExtendedData();
+
+            arg1._data!.ColumnDefinitions = arg2;
+            arg1._data!.ColumnDefinitions.IsDirty = true;
+            arg1._data!.ColumnDefinitions.Parent = arg1;
+        }
+
+        private static void RowDefinitionsPropertyChanged(Grid arg1, AvaloniaPropertyChangedEventArgs arg2)
+        {
+            var val = arg2.NewValue as RowDefinitions;
+            RowDefinitionsPropertyChangedCore(arg1, val);
+        }
+
+        private static void RowDefinitionsPropertyChangedCore(Grid arg1, RowDefinitions arg2)
+        {
+            if (arg1._data is null)
+                arg1._data = new ExtendedData();
+
+            arg1._data!.RowDefinitions = arg2;
+            arg1._data!.RowDefinitions.IsDirty = true;
+            arg1._data!.RowDefinitions.Parent = arg1;
         }
+/// 
 
         /// <summary>
         /// Default constructor.
@@ -160,45 +197,49 @@ public bool ShowGridLines
             set { SetValue(ShowGridLinesProperty, value); }
         }
 
-        /// <summary>
-        /// Returns a ColumnDefinitions of column definitions.
-        /// </summary>
+        public static readonly StyledProperty<ColumnDefinitions> ColumnDefinitionsProperty =
+            AvaloniaProperty.Register<Grid, ColumnDefinitions>(nameof(ColumnDefinitions));
+
         public ColumnDefinitions ColumnDefinitions
         {
             get
             {
                 if (_data == null) { _data = new ExtendedData(); }
-                if (_data.ColumnDefinitions == null) { _data.ColumnDefinitions = new ColumnDefinitions() { Parent = this }; }
+                if (_data.ColumnDefinitions == null)
+                {
+                    _data.ColumnDefinitions = new ColumnDefinitions() { Parent = this };
+                    SetValue(ColumnDefinitionsProperty, _data.ColumnDefinitions);
+                }
 
-                return (_data.ColumnDefinitions);
+                return GetValue(ColumnDefinitionsProperty);
             }
             set
             {
-                if (_data == null) { _data = new ExtendedData(); }
-                _data.ColumnDefinitions = value;
-                _data.ColumnDefinitions.Parent = this;
-                InvalidateMeasure();
+                ColumnDefinitionsPropertyChangedCore(this, value);
+                SetValue(ColumnDefinitionsProperty, _data.ColumnDefinitions);
             }
         }
 
-        /// <summary>
-        /// Returns a RowDefinitions of row definitions.
-        /// </summary>
+        public static readonly StyledProperty<RowDefinitions> RowDefinitionsProperty =
+            AvaloniaProperty.Register<Grid, RowDefinitions>(nameof(RowDefinitions));
+
         public RowDefinitions RowDefinitions
         {
             get
             {
                 if (_data == null) { _data = new ExtendedData(); }
-                if (_data.RowDefinitions == null) { _data.RowDefinitions = new RowDefinitions() { Parent = this }; }
+                if (_data.RowDefinitions == null)
+                {
+                    _data.RowDefinitions = new RowDefinitions() { Parent = this };
+                    SetValue(RowDefinitionsProperty, _data.RowDefinitions);
+                }
 
-                return (_data.RowDefinitions);
+                return GetValue(RowDefinitionsProperty);
             }
             set
             {
-                if (_data == null) { _data = new ExtendedData(); }
-                _data.RowDefinitions = value;
-                _data.RowDefinitions.Parent = this;
-                InvalidateMeasure();
+                RowDefinitionsPropertyChangedCore(this, value);
+                SetValue(RowDefinitionsProperty, _data.RowDefinitions);
             }
         }
 
@@ -2314,7 +2355,7 @@ private void SetValid()
                 }
             }
         }
- 
+
         /// <summary>
         /// Synchronized ShowGridLines property with the state of the grid's visual collection
         /// by adding / removing GridLinesRenderer visual.