Merge branch 'master' into feature/windowstate-fullscreen

6 years ago · c7c3d1c48b
1 changed files with 1 additions and 1 deletions
--- a/src/Avalonia.Controls.DataGrid/DataGridBoundColumn.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridBoundColumn.cs
@ -55,7 +55,7 @@ namespace Avalonia.Controls
                                binding.Mode = BindingMode.TwoWay;
                            } 

-                            if (binding.Converter == null)
+                            if (binding.Converter == null && string.IsNullOrEmpty(binding.StringFormat))
                            {
                                binding.Converter = DataGridValueConverter.Instance;
                            }