Skip to content

Commit 1599c21

Browse files
committed
removed template column measure check
1 parent 417ae32 commit 1599c21

File tree

1 file changed

+1
-15
lines changed

1 file changed

+1
-15
lines changed

src/TableViewCell.cs

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -84,27 +84,13 @@ protected override void OnApplyTemplate()
8484

8585
protected override Size MeasureOverride(Size availableSize)
8686
{
87-
if ((Content ?? ContentTemplateRoot) is FrameworkElement element)
87+
if (Content is FrameworkElement element)
8888
{
8989
var v_GridLineStrokeThickness = TableView?.HeaderGridLinesVisibility is TableViewGridLinesVisibility.All or TableViewGridLinesVisibility.Vertical
9090
|| TableView?.GridLinesVisibility is TableViewGridLinesVisibility.All or TableViewGridLinesVisibility.Vertical
9191
? TableView.VerticalGridLinesStrokeThickness : 0;
9292
#if WINDOWS
9393
#region TEMP_FIX_FOR_ISSUE https://github.com/microsoft/microsoft-ui-xaml/issues/9860
94-
if (Column is TableViewTemplateColumn)
95-
{
96-
if (element is ContentControl contentControl &&
97-
(contentControl.Content ?? contentControl.ContentTemplateRoot) is FrameworkElement contentElement)
98-
{
99-
element = contentElement;
100-
}
101-
else
102-
{
103-
return base.MeasureOverride(availableSize);
104-
}
105-
}
106-
107-
10894
var contentWidth = Column?.ActualWidth ?? 0d;
10995
contentWidth -= element.Margin.Left;
11096
contentWidth -= element.Margin.Right;

0 commit comments

Comments
 (0)