Merge pull request #119 from unoplatform/dev/sb/datagrid-text-column

Remove Border from DataGridTextColumn content
unoplatform · Dec 14, 2020 · b139f9a · b139f9a
2 parents dd58588 + 496630c
commit b139f9a
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridTextColumn.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridTextColumn.cs
@@ -244,8 +244,7 @@ protected override FrameworkElement GenerateElement(DataGridCell cell, object da
                 textBlockElement.SetBinding(TextBlock.TextProperty, this.Binding);
             }
 
-            // UNO TODO
-            return new Border { Child = textBlockElement };
+            return textBlockElement;
         }
 
         /// <summary>
@@ -292,8 +291,7 @@ protected internal override void RefreshCellContent(FrameworkElement element, Br
             TextBox textBox = element as TextBox;
             if (textBox == null)
             {
-                // UNO TODO
-                TextBlock textBlock = (element as Border)?.Child as TextBlock;
+                TextBlock textBlock = element as TextBlock;
                 if (textBlock == null)
                 {
                     throw DataGridError.DataGrid.ValueIsNotAnInstanceOfEitherOr("element", typeof(TextBox), typeof(TextBlock));
@@ -381,8 +379,7 @@ protected internal override void RefreshForeground(FrameworkElement element, Bru
             }
             else
             {
-                // UNO TODO
-                TextBlock textBlock = (element as Border)?.Child as TextBlock;
+                TextBlock textBlock = element as TextBlock;
                 if (textBlock != null)
                 {
                     RefreshForeground(textBlock, computedRowForeground);