File tree Expand file tree Collapse file tree 1 file changed +1
-15
lines changed Expand file tree Collapse file tree 1 file changed +1
-15
lines changed Original file line number Diff line number Diff line change @@ -84,27 +84,13 @@ protected override void OnApplyTemplate()
84
84
85
85
protected override Size MeasureOverride ( Size availableSize )
86
86
{
87
- if ( ( Content ?? ContentTemplateRoot ) is FrameworkElement element )
87
+ if ( Content is FrameworkElement element )
88
88
{
89
89
var v_GridLineStrokeThickness = TableView ? . HeaderGridLinesVisibility is TableViewGridLinesVisibility . All or TableViewGridLinesVisibility . Vertical
90
90
|| TableView ? . GridLinesVisibility is TableViewGridLinesVisibility . All or TableViewGridLinesVisibility . Vertical
91
91
? TableView . VerticalGridLinesStrokeThickness : 0 ;
92
92
#if WINDOWS
93
93
#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
-
108
94
var contentWidth = Column ? . ActualWidth ?? 0d ;
109
95
contentWidth -= element . Margin . Left ;
110
96
contentWidth -= element . Margin . Right ;
You can’t perform that action at this time.
0 commit comments