Revised DataGrid-Text-Cell (#1787)

greuelpirat · Keboo · web-flow · commit ffb48f076c1f · 2020-05-05T21:52:37.000-07:00
* Fixed missing style on auto generated DataGridTextColumn (#1779) * Fixed various warnings for Grids.xaml and List.xaml (#1779) * Added AutoGeneratedTextStyle for ValidationErrorTemplate on TextBlock (#1779) * Changed header styles, moved margin (#1779) * Removed custom padding from first grid (#1779) * Using List1 for first grid, List2 for second (#1779) * Added NotEmptyValidationRule to Name column for testing purposes (#1779) * MaterialDesignDataGridTextColumnEditingStyle uses ValidationErrorBrush on Validation.HasError (#1779) * Own Validation-Error-Implementation for MaterialDesignDataGridTextColumnPopupEditingStyle (#1779) * Fixed position difference between view and edit style for text column (#1779) * Remove default error template for MaterialDesignDataGridCell (#1779) * Adding sample of validation with default DataGridTextColumn Renamed Grids, to DataGrids in demo app. Co-authored-by: Kevin Bost <kitokeboo@gmail.com>
diff --git a/MainDemo.Wpf/DataGrids.xaml b/MainDemo.Wpf/DataGrids.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="MaterialDesignColors.WpfExample.Grids"
+<UserControl x:Class="MaterialDesignColors.WpfExample.DataGrids"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -7,7 +7,7 @@
              xmlns:smtx="clr-namespace:ShowMeTheXAML;assembly=ShowMeTheXAML"
              xmlns:domain="clr-namespace:MaterialDesignDemo.Domain"
              mc:Ignorable="d" 
-             d:DesignHeight="300" d:DesignWidth="600">
+             d:DesignHeight="300" d:DesignWidth="600" d:DataContext="{d:DesignInstance domain:ListsAndGridsViewModel}">
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -16,11 +16,11 @@
         </ResourceDictionary>
     </UserControl.Resources>
     <ScrollViewer>
-        <StackPanel>
-            <TextBlock>Custom Columns</TextBlock>
+        <StackPanel Margin="5 0 0 0">
+            <TextBlock Style="{StaticResource MaterialDesignHeadline5TextBlock}" Text="Custom Columns"/>
             <smtx:XamlDisplay Key="grids_1">
-                <DataGrid Margin="0 8 0 0" ItemsSource="{Binding Items3}" CanUserSortColumns="True" CanUserAddRows="False" AutoGenerateColumns="False"
-                          materialDesign:DataGridAssist.CellPadding="13 8 8 8" materialDesign:DataGridAssist.ColumnHeaderPadding="8" HeadersVisibility="All">
+                <DataGrid ItemsSource="{Binding Items1}" CanUserSortColumns="True" CanUserAddRows="False" AutoGenerateColumns="False"
+                          HeadersVisibility="All">
                     <DataGrid.Resources>
                         <domain:BindingProxy x:Key="DataContextProxy" Data="{Binding}" />
                     </DataGrid.Resources>
@@ -32,23 +32,38 @@
                                 <!--padding to allow hit test to pass thru for sorting -->
                                 <Border Background="Transparent" Padding="6 0 6 0" HorizontalAlignment="Center">
                                     <CheckBox HorizontalAlignment="Center"
-                                              IsChecked="{Binding Data.IsAllItems3Selected, Source={StaticResource DataContextProxy}}" />
+                                              IsChecked="{Binding Data.IsAllItems1Selected, Source={StaticResource DataContextProxy}}" />
                                 </Border>
                             </DataGridCheckBoxColumn.Header>
                         </DataGridCheckBoxColumn>
                         <DataGridTextColumn Binding="{Binding Code}"
-                                        Header="Code"
-                                        EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}" />
+                                            Header="Code"
+                                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}" />
                         <!-- if you want to use the pop up style (MaterialDesignDataGridTextColumnPopupEditingStyle), you must use MaterialDataGridTextColumn -->
-                        <materialDesign:DataGridTextColumn Binding="{Binding Name}"
-                                                           Header="Name"
-                                                           EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnPopupEditingStyle}" 
-                                                           />
+                        <materialDesign:DataGridTextColumn Header="Name"
+                                                           ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                                                           EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnPopupEditingStyle}">
+                            <materialDesign:DataGridTextColumn.Binding>
+                                <Binding Path="Name">
+                                    <Binding.ValidationRules>
+                                        <domain:NotEmptyValidationRule />
+                                    </Binding.ValidationRules>
+                                </Binding>
+                            </materialDesign:DataGridTextColumn.Binding>
+                        </materialDesign:DataGridTextColumn>
                         <!-- set a max length to get an indicator in the editor -->
-                        <materialDesign:DataGridTextColumn Binding="{Binding Description}"
-                                                           Header="Description"
-                                                           MaxLength="255" 
-                                                           EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnPopupEditingStyle}"  />
+                        <DataGridTextColumn Header="Description"
+                                            ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
+                                            EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}">
+                            <DataGridTextColumn.Binding>
+                                <Binding Path="Description">
+                                    <Binding.ValidationRules>
+                                        <domain:NotEmptyValidationRule />
+                                    </Binding.ValidationRules>
+                                </Binding>
+                            </DataGridTextColumn.Binding>
+                        </DataGridTextColumn>
                         <materialDesign:DataGridTextColumn Binding="{Binding Numeric}"
                                                         Header="Number with long header"
                                                         Width="120"
@@ -66,7 +81,7 @@
                                 </Style>
                             </DataGridTextColumn.HeaderStyle>
                             <DataGridTextColumn.ElementStyle>
-                                <Style TargetType="{x:Type TextBlock}">
+                                <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource MaterialDesignDataGridTextColumnStyle}">
                                     <Setter Property="HorizontalAlignment" Value="Right" />
                                 </Style>
                             </DataGridTextColumn.ElementStyle>
@@ -87,15 +102,14 @@
                     </DataGrid.Columns>
                 </DataGrid>
             </smtx:XamlDisplay>
-            <TextBlock Margin="0 24 0 0">Auto Generated Columns</TextBlock>
+            <TextBlock Style="{StaticResource MaterialDesignHeadline5TextBlock}" Text="Auto Generated Columns" Margin="0 24 0 0"/>
             <smtx:XamlDisplay Key="grids_2">
-                <DataGrid  Margin="0 8 0 0" ItemsSource="{Binding Items3}" CanUserSortColumns="True" CanUserAddRows="False" />
+                <DataGrid ItemsSource="{Binding Items2}" CanUserSortColumns="True" CanUserAddRows="False" />
             </smtx:XamlDisplay>
-            <TextBlock Margin="0 24 0 0">Custom Padding</TextBlock>
+            <TextBlock Style="{StaticResource MaterialDesignHeadline6TextBlock}" Text="Custom Padding" Margin="0 24 0 0"/>
             <smtx:XamlDisplay Key="grids_3">
-                <DataGrid  Margin="0 8 0 0" ItemsSource="{Binding Items3}" CanUserSortColumns="True" CanUserAddRows="False"
-                           materialDesign:DataGridAssist.CellPadding="4 2 2 2" materialDesign:DataGridAssist.ColumnHeaderPadding="4 2 2 2"
-                           />
+                <DataGrid ItemsSource="{Binding Items3}" CanUserSortColumns="True" CanUserAddRows="False"
+                          materialDesign:DataGridAssist.CellPadding="4 2 2 2" materialDesign:DataGridAssist.ColumnHeaderPadding="4 2 2 2" />
             </smtx:XamlDisplay>
         </StackPanel>
     </ScrollViewer>
diff --git a/MainDemo.Wpf/DataGrids.xaml.cs b/MainDemo.Wpf/DataGrids.xaml.cs
@@ -5,9 +5,9 @@ namespace MaterialDesignColors.WpfExample
     /// <summary>
     /// Interaction logic for Grids.xaml
     /// </summary>
-    public partial class Grids : UserControl
+    public partial class DataGrids : UserControl
     {
-        public Grids()
+        public DataGrids()
         {
             InitializeComponent();
         }
diff --git a/MainDemo.Wpf/Domain/ListsAndGridsViewModel.cs b/MainDemo.Wpf/Domain/ListsAndGridsViewModel.cs
@@ -1,46 +1,41 @@
 ﻿using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
-using System.Runtime.CompilerServices;
-using MaterialDesignColors.WpfExample.Domain;
 using System.Linq;
+using System.Runtime.CompilerServices;
 
 namespace MaterialDesignDemo.Domain
 {
     public class ListsAndGridsViewModel : INotifyPropertyChanged
     {
-        private readonly ObservableCollection<SelectableViewModel> _items1;
-        private readonly ObservableCollection<SelectableViewModel> _items2;
-        private readonly ObservableCollection<SelectableViewModel> _items3;
-
         public ListsAndGridsViewModel()
         {
-            _items1 = CreateData();
-            _items2 = CreateData();
-            _items3 = CreateData();
+            Items1 = CreateData();
+            Items2 = CreateData();
+            Items3 = CreateData();
 
-            foreach (var model in _items3)
+            foreach (var model in Items1)
             {
                 model.PropertyChanged += (sender, args) =>
                 {
                     if (args.PropertyName == nameof(SelectableViewModel.IsSelected))
-                        OnPropertyChanged(nameof(IsAllItems3Selected));
+                        OnPropertyChanged(nameof(IsAllItems1Selected));
                 };
             }
         }
 
-        public bool? IsAllItems3Selected
+        public bool? IsAllItems1Selected
         {
             get
             {
-                var selected = _items3.Select(item => item.IsSelected).Distinct().ToList();
+                var selected = Items1.Select(item => item.IsSelected).Distinct().ToList();
                 return selected.Count == 1 ? selected.Single() : (bool?) null;
             }
             set
             {
                 if (value.HasValue)
                 {
-                    SelectAll(value.Value, Items3);
+                    SelectAll(value.Value, Items1);
                     OnPropertyChanged();
                 }
             }
@@ -80,10 +75,9 @@ private static ObservableCollection<SelectableViewModel> CreateData()
             };
         }
 
-        public ObservableCollection<SelectableViewModel> Items1 => _items1;
-        public ObservableCollection<SelectableViewModel> Items2 => _items2;
-
-        public ObservableCollection<SelectableViewModel> Items3 => _items3;
+        public ObservableCollection<SelectableViewModel> Items1 { get; }
+        public ObservableCollection<SelectableViewModel> Items2 { get; }
+        public ObservableCollection<SelectableViewModel> Items3 { get; }
 
         public event PropertyChangedEventHandler PropertyChanged;
 
@@ -92,15 +86,6 @@ protected virtual void OnPropertyChanged([CallerMemberName] string propertyName
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
 
-        public IEnumerable<string> Foods
-        {
-            get
-            {
-                yield return "Burger";
-                yield return "Fries";
-                yield return "Shake";
-                yield return "Lettuce";
-            }
-        }
+        public IEnumerable<string> Foods => new[] { "Burger", "Fries", "Shake", "Lettuce" };
     }
 }
diff --git a/MainDemo.Wpf/Domain/MainWindowViewModel.cs b/MainDemo.Wpf/Domain/MainWindowViewModel.cs
@@ -207,10 +207,10 @@ private ObservableCollection<DemoItem> GenerateDemoItems(ISnackbarMessageQueue s
                         DocumentationLink.DemoPageLink<TreesViewModel>("Demo View Model"),
                         DocumentationLink.StyleLink("TreeView")
                     }),
-                new DemoItem("Grids", new Grids { DataContext = new ListsAndGridsViewModel()},
+                new DemoItem("Data Grids", new DataGrids { DataContext = new ListsAndGridsViewModel()},
                     new []
                     {
-                        DocumentationLink.DemoPageLink<Grids>("Demo View"),
+                        DocumentationLink.DemoPageLink<DataGrids>("Demo View"),
                         DocumentationLink.DemoPageLink<ListsAndGridsViewModel>("Demo View Model", "Domain"),
                         DocumentationLink.StyleLink("DataGrid")
                     }),
diff --git a/MainDemo.Wpf/Domain/SelectableViewModel.cs b/MainDemo.Wpf/Domain/SelectableViewModel.cs
@@ -1,10 +1,9 @@
-﻿using System.ComponentModel;
+﻿using System;
+using System.ComponentModel;
 using System.Runtime.CompilerServices;
 
-
-namespace MaterialDesignColors.WpfExample.Domain
+namespace MaterialDesignDemo.Domain
 {
-
     public class SelectableViewModel : INotifyPropertyChanged
     {
         private bool _isSelected;
@@ -16,7 +15,7 @@ public class SelectableViewModel : INotifyPropertyChanged
 
         public bool IsSelected
         {
-            get { return _isSelected; }
+            get => _isSelected;
             set
             {
                 if (_isSelected == value) return;
@@ -27,7 +26,7 @@ public bool IsSelected
 
         public char Code
         {
-            get { return _code; }
+            get => _code;
             set
             {
                 if (_code == value) return;
@@ -38,7 +37,7 @@ public char Code
 
         public string Name
         {
-            get { return _name; }
+            get => _name;
             set
             {
                 if (_name == value) return;
@@ -49,7 +48,7 @@ public string Name
 
         public string Description
         {
-            get { return _description; }
+            get => _description;
             set
             {
                 if (_description == value) return;
@@ -60,18 +59,18 @@ public string Description
 
         public double Numeric
         {
-            get { return _numeric; }
+            get => _numeric;
             set
             {
-                if (_numeric == value) return;
+                if (Math.Abs(_numeric - value) < 0.01) return;
                 _numeric = value;
                 OnPropertyChanged();
             }
         }
 
         public string Food
         {
-            get { return _food; }
+            get => _food;
             set
             {
                 if (_food == value) return;
@@ -84,8 +83,7 @@ public string Food
 
         protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
         {
-            var handler = PropertyChanged;
-            if (handler != null) handler(this, new PropertyChangedEventArgs(propertyName));
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
     }
-}
+}
diff --git a/MainDemo.Wpf/Lists.xaml b/MainDemo.Wpf/Lists.xaml
@@ -3,10 +3,10 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:domain="clr-namespace:MaterialDesignColors.WpfExample.Domain"
+             xmlns:domain="clr-namespace:MaterialDesignDemo.Domain"
              xmlns:smtx="clr-namespace:ShowMeTheXAML;assembly=ShowMeTheXAML"
              mc:Ignorable="d" 
-             d:DesignHeight="300" d:DesignWidth="300">
+             d:DesignHeight="300" d:DesignWidth="300" d:DataContext="{d:DesignInstance domain:ListsAndGridsViewModel}">
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
diff --git a/MaterialDesignThemes.Wpf/DataGridAssist.cs b/MaterialDesignThemes.Wpf/DataGridAssist.cs
@@ -66,6 +66,33 @@ public static Style GetAutoGeneratedEditingCheckBoxStyle(DependencyObject elemen
         {
             return (Style)element.GetValue(AutoGeneratedEditingCheckBoxStyleProperty);
         }
+        
+        public static readonly DependencyProperty AutoGeneratedTextStyleProperty = DependencyProperty
+            .RegisterAttached(
+                "AutoGeneratedTextStyle", typeof(Style), typeof(DataGridAssist),
+                new PropertyMetadata(default(Style), AutoGeneratedTextStylePropertyChangedCallback));
+
+        private static void AutoGeneratedTextStylePropertyChangedCallback(DependencyObject dependencyObject,
+            DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
+        {
+            ((DataGrid)dependencyObject).AutoGeneratingColumn += (sender, args) =>
+            {
+                var dataGridTextColumn = args.Column as System.Windows.Controls.DataGridTextColumn;
+                if (dataGridTextColumn == null) return;
+
+                dataGridTextColumn.ElementStyle = GetAutoGeneratedTextStyle(dependencyObject);
+            };
+        }
+
+        public static void SetAutoGeneratedTextStyle(DependencyObject element, Style value)
+        {
+            element.SetValue(AutoGeneratedTextStyleProperty, value);
+        }
+
+        public static Style GetAutoGeneratedTextStyle(DependencyObject element)
+        {
+            return (Style)element.GetValue(AutoGeneratedTextStyleProperty);
+        }
 
         public static readonly DependencyProperty AutoGeneratedEditingTextStyleProperty = DependencyProperty
             .RegisterAttached(
@@ -77,7 +104,7 @@ private static void AutoGeneratedEditingTextStylePropertyChangedCallback(Depende
         {
             ((DataGrid)dependencyObject).AutoGeneratingColumn += (sender, args) =>
            {
-               var dataGridTextColumn = args.Column as DataGridTextColumn;
+               var dataGridTextColumn = args.Column as System.Windows.Controls.DataGridTextColumn;
                if (dataGridTextColumn == null) return;
 
                dataGridTextColumn.EditingElementStyle = GetAutoGeneratedEditingTextStyle(dependencyObject);
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DataGrid.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DataGrid.xaml

Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@ namespace MaterialDesignColors.WpfExample`
`5`	`5`	`/// <summary>`
`6`	`6`	`/// Interaction logic for Grids.xaml`
`7`	`7`	`/// </summary>`
`8`		`- public partial class Grids : UserControl`
	`8`	`+ public partial class DataGrids : UserControl`
`9`	`9`	`{`
`10`		`- public Grids()`
	`10`	`+ public DataGrids()`
`11`	`11`	`{`
`12`	`12`	`InitializeComponent();`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,46 +1,41 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`	`2`	`using System.Collections.ObjectModel;`
`3`	`3`	`using System.ComponentModel;`
`4`		`-using System.Runtime.CompilerServices;`
`5`		`-using MaterialDesignColors.WpfExample.Domain;`
`6`	`4`	`using System.Linq;`
	`5`	`+using System.Runtime.CompilerServices;`
`7`	`6`
`8`	`7`	`namespace MaterialDesignDemo.Domain`
`9`	`8`	`{`
`10`	`9`	`public class ListsAndGridsViewModel : INotifyPropertyChanged`
`11`	`10`	`{`
`12`		`- private readonly ObservableCollection<SelectableViewModel> _items1;`
`13`		`- private readonly ObservableCollection<SelectableViewModel> _items2;`
`14`		`- private readonly ObservableCollection<SelectableViewModel> _items3;`
`15`		`-`
`16`	`11`	`public ListsAndGridsViewModel()`
`17`	`12`	`{`
`18`		`- _items1 = CreateData();`
`19`		`- _items2 = CreateData();`
`20`		`- _items3 = CreateData();`
	`13`	`+ Items1 = CreateData();`
	`14`	`+ Items2 = CreateData();`
	`15`	`+ Items3 = CreateData();`
`21`	`16`
`22`		`- foreach (var model in _items3)`
	`17`	`+ foreach (var model in Items1)`
`23`	`18`	`{`
`24`	`19`	`model.PropertyChanged += (sender, args) =>`
`25`	`20`	`{`
`26`	`21`	`if (args.PropertyName == nameof(SelectableViewModel.IsSelected))`
`27`		`- OnPropertyChanged(nameof(IsAllItems3Selected));`
	`22`	`+ OnPropertyChanged(nameof(IsAllItems1Selected));`
`28`	`23`	`};`
`29`	`24`	`}`
`30`	`25`	`}`
`31`	`26`
`32`		`- public bool? IsAllItems3Selected`
	`27`	`+ public bool? IsAllItems1Selected`
`33`	`28`	`{`
`34`	`29`	`get`
`35`	`30`	`{`
`36`		`- var selected = _items3.Select(item => item.IsSelected).Distinct().ToList();`
	`31`	`+ var selected = Items1.Select(item => item.IsSelected).Distinct().ToList();`
`37`	`32`	`return selected.Count == 1 ? selected.Single() : (bool?) null;`
`38`	`33`	`}`
`39`	`34`	`set`
`40`	`35`	`{`
`41`	`36`	`if (value.HasValue)`
`42`	`37`	`{`
`43`		`- SelectAll(value.Value, Items3);`
	`38`	`+ SelectAll(value.Value, Items1);`
`44`	`39`	`OnPropertyChanged();`
`45`	`40`	`}`
`46`	`41`	`}`
`@@ -80,10 +75,9 @@ private static ObservableCollection<SelectableViewModel> CreateData()`
`80`	`75`	`};`
`81`	`76`	`}`
`82`	`77`
`83`		`- public ObservableCollection<SelectableViewModel> Items1 => _items1;`
`84`		`- public ObservableCollection<SelectableViewModel> Items2 => _items2;`
`85`		`-`
`86`		`- public ObservableCollection<SelectableViewModel> Items3 => _items3;`
	`78`	`+ public ObservableCollection<SelectableViewModel> Items1 { get; }`
	`79`	`+ public ObservableCollection<SelectableViewModel> Items2 { get; }`
	`80`	`+ public ObservableCollection<SelectableViewModel> Items3 { get; }`
`87`	`81`
`88`	`82`	`public event PropertyChangedEventHandler PropertyChanged;`
`89`	`83`
`@@ -92,15 +86,6 @@ protected virtual void OnPropertyChanged([CallerMemberName] string propertyName`
`92`	`86`	`PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));`
`93`	`87`	`}`
`94`	`88`
`95`		`- public IEnumerable<string> Foods`
`96`		`- {`
`97`		`- get`
`98`		`- {`
`99`		`- yield return "Burger";`
`100`		`- yield return "Fries";`
`101`		`- yield return "Shake";`
`102`		`- yield return "Lettuce";`
`103`		`- }`
`104`		`- }`
	`89`	`+ public IEnumerable<string> Foods => new[] { "Burger", "Fries", "Shake", "Lettuce" };`
`105`	`90`	`}`
`106`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,9 @@`
`1`		`-using System.ComponentModel;`
	`1`	`+using System;`
	`2`	`+using System.ComponentModel;`
`2`	`3`	`using System.Runtime.CompilerServices;`
`3`	`4`
`4`		`-`
`5`		`-namespace MaterialDesignColors.WpfExample.Domain`
	`5`	`+namespace MaterialDesignDemo.Domain`
`6`	`6`	`{`
`7`		`-`
`8`	`7`	`public class SelectableViewModel : INotifyPropertyChanged`
`9`	`8`	`{`
`10`	`9`	`private bool _isSelected;`
`@@ -16,7 +15,7 @@ public class SelectableViewModel : INotifyPropertyChanged`
`16`	`15`
`17`	`16`	`public bool IsSelected`
`18`	`17`	`{`
`19`		`- get { return _isSelected; }`
	`18`	`+ get => _isSelected;`
`20`	`19`	`set`
`21`	`20`	`{`
`22`	`21`	`if (_isSelected == value) return;`
`@@ -27,7 +26,7 @@ public bool IsSelected`
`27`	`26`
`28`	`27`	`public char Code`
`29`	`28`	`{`
`30`		`- get { return _code; }`
	`29`	`+ get => _code;`
`31`	`30`	`set`
`32`	`31`	`{`
`33`	`32`	`if (_code == value) return;`
`@@ -38,7 +37,7 @@ public char Code`
`38`	`37`
`39`	`38`	`public string Name`
`40`	`39`	`{`
`41`		`- get { return _name; }`
	`40`	`+ get => _name;`
`42`	`41`	`set`
`43`	`42`	`{`
`44`	`43`	`if (_name == value) return;`
`@@ -49,7 +48,7 @@ public string Name`
`49`	`48`
`50`	`49`	`public string Description`
`51`	`50`	`{`
`52`		`- get { return _description; }`
	`51`	`+ get => _description;`
`53`	`52`	`set`
`54`	`53`	`{`
`55`	`54`	`if (_description == value) return;`
`@@ -60,18 +59,18 @@ public string Description`
`60`	`59`
`61`	`60`	`public double Numeric`
`62`	`61`	`{`
`63`		`- get { return _numeric; }`
	`62`	`+ get => _numeric;`
`64`	`63`	`set`
`65`	`64`	`{`
`66`		`- if (_numeric == value) return;`
	`65`	`+ if (Math.Abs(_numeric - value) < 0.01) return;`
`67`	`66`	`_numeric = value;`
`68`	`67`	`OnPropertyChanged();`
`69`	`68`	`}`
`70`	`69`	`}`
`71`	`70`
`72`	`71`	`public string Food`
`73`	`72`	`{`
`74`		`- get { return _food; }`
	`73`	`+ get => _food;`
`75`	`74`	`set`
`76`	`75`	`{`
`77`	`76`	`if (_food == value) return;`
`@@ -84,8 +83,7 @@ public string Food`
`84`	`83`
`85`	`84`	`protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)`
`86`	`85`	`{`
`87`		`- var handler = PropertyChanged;`
`88`		`- if (handler != null) handler(this, new PropertyChangedEventArgs(propertyName));`
	`86`	`+ PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));`
`89`	`87`	`}`
`90`	`88`	`}`
`91`		`-}`
	`89`	`+}`