From 9dc40dc99bb4555d0b76614103ea5a7baca2e43c Mon Sep 17 00:00:00 2001 From: Jumar Macato Date: Sat, 25 May 2019 11:39:40 +0800 Subject: [PATCH] Temporarily hook row and col def change to ExtData. --- src/Avalonia.Controls/GridWPF.cs | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/Avalonia.Controls/GridWPF.cs b/src/Avalonia.Controls/GridWPF.cs index e85fa1cdb0..89ae5c6bf5 100644 --- a/src/Avalonia.Controls/GridWPF.cs +++ b/src/Avalonia.Controls/GridWPF.cs @@ -207,7 +207,12 @@ namespace Avalonia.Controls _columnDefinitions = value; _columnDefinitions.TrackItemPropertyChanged(_ => InvalidateMeasure()); - _columnDefinitions.CollectionChanged += (_, __) => InvalidateMeasure(); + _columnDefinitions.CollectionChanged += (_, __) => + { + _data.DefinitionsU = _columnDefinitions.Select(p => (DefinitionBase)p).ToArray(); + InvalidateMeasure(); + }; + } } @@ -237,11 +242,15 @@ namespace Avalonia.Controls _rowDefinitions = value; _rowDefinitions.TrackItemPropertyChanged(_ => InvalidateMeasure()); - _rowDefinitions.CollectionChanged += (_, __) => InvalidateMeasure(); + _rowDefinitions.CollectionChanged += (_, __) => + { + _data.DefinitionsV = _rowDefinitions.Select(p => (DefinitionBase)p).ToArray(); + InvalidateMeasure(); + }; } } - private bool rowColDefsEmpty => (RowDefinitions == null || RowDefinitions?.Count == 0 ) && + private bool rowColDefsEmpty => (RowDefinitions == null || RowDefinitions?.Count == 0) && (ColumnDefinitions == null || ColumnDefinitions?.Count == 0); ///