Remove invalid Fluent DataGridColumn styles (#9757)

* Update DataGrid.xaml * Remove invalid styles * Run theme generator * Fix encoding in generated files * Fix theme generator script: Force UTF-8 encoding when processing XAML files --------- Co-authored-by: Mitch Razga <[email protected]>
dotnet · Oct 10, 2024 · 3c5b1c7 · 3c5b1c7
1 parent fe2c488
commit 3c5b1c7
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 37 deletions.
diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/Generator/ThemeGenerator.Fluent.ps1 b/src/Microsoft.DotNet.Wpf/src/Themes/Generator/ThemeGenerator.Fluent.ps1
@@ -28,16 +28,16 @@ foreach($themeColor in $themeColors)
         if($file.BaseName -eq "Fluent") {
             continue
         }
-        [xml]$currentXaml = Get-Content $file.FullName
+        [xml]$currentXaml = Get-Content $file.FullName -Encoding UTF8
 
         $combinedXaml.ResourceDictionary.InnerXml += $currentXaml.ResourceDictionary.InnerXml
     }
 
-    [xml]$themeColorXaml = Get-Content $themeColorFilePath
+    [xml]$themeColorXaml = Get-Content $themeColorFilePath -Encoding UTF8
     $combinedXaml.ResourceDictionary.InnerXml += $themeColorXaml.ResourceDictionary.InnerXml
 
     foreach ($file in Get-ChildItem $styleFilesDir -Filter "*.xaml") {
-        [xml]$currentXaml = Get-Content $file.FullName
+        [xml]$currentXaml = Get-Content $file.FullName -Encoding UTF8
         $combinedXaml.ResourceDictionary.InnerXml += $currentXaml.ResourceDictionary.InnerXml
     }
 

diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/DataGrid.xaml b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/DataGrid.xaml
@@ -59,8 +59,6 @@
 
     <!--  END REMOVE COLORS  -->
 
-    <Style x:Key="DefaultDataGridCheckBoxColumnCellStyle" TargetType="{x:Type DataGridColumn}" />
-
     <Style x:Key="{ComponentResourceKey ResourceId=DataGridSelectAllButtonStyle, TypeInTargetAssembly={x:Type DataGrid}}" TargetType="{x:Type Button}">
         <Setter Property="OverridesDefaultStyle" Value="True" />
         <Setter Property="Template">
@@ -502,9 +500,6 @@
             </Trigger>
         </Style.Triggers>
     </Style>
-    <Style TargetType="{x:Type DataGridTextColumn}">
-        <Setter Property="EditingElementStyle" Value="{StaticResource TextBoxStyle}" />
-    </Style>
 
     <!--  Style and template for the DataGrid.  -->
     <Style x:Key="DefaultDataGridStyle" TargetType="{x:Type DataGrid}">
@@ -787,11 +782,6 @@
         <Setter Property="SnapsToDevicePixels" Value="True" />
     </Style>
 
-    <Style TargetType="{x:Type DataGridCheckBoxColumn}">
-        <Setter Property="ElementStyle" Value="{StaticResource DataGridCheckBoxElementDefaultStyle}" />
-        <Setter Property="EditingElementStyle" Value="{StaticResource DataGridCheckBoxEditingElementDefaultStyle}" />
-    </Style>
-
     <Style BasedOn="{StaticResource DefaultDataGridColumnHeadersPresenterStyle}" TargetType="{x:Type DataGridColumnHeadersPresenter}" />
     <Style BasedOn="{StaticResource DefaultDataGridStyle}" TargetType="{x:Type DataGrid}" />
 

diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.Dark.xaml b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.Dark.xaml
@@ -1572,7 +1572,6 @@
     </LinearGradientBrush.GradientStops>
   </LinearGradientBrush>
   <!--  END REMOVE COLORS  -->
-  <Style x:Key="DefaultDataGridCheckBoxColumnCellStyle" TargetType="{x:Type DataGridColumn}" />
   <Style x:Key="{ComponentResourceKey ResourceId=DataGridSelectAllButtonStyle, TypeInTargetAssembly={x:Type DataGrid}}" TargetType="{x:Type Button}">
     <Setter Property="OverridesDefaultStyle" Value="True" />
     <Setter Property="Template">
@@ -1901,9 +1900,6 @@
       </Trigger>
     </Style.Triggers>
   </Style>
-  <Style TargetType="{x:Type DataGridTextColumn}">
-    <Setter Property="EditingElementStyle" Value="{StaticResource TextBoxStyle}" />
-  </Style>
   <!--  Style and template for the DataGrid.  -->
   <Style x:Key="DefaultDataGridStyle" TargetType="{x:Type DataGrid}">
     <Setter Property="FocusVisualStyle" Value="{x:Null}" />
@@ -2107,10 +2103,6 @@
   <Style x:Key="DataGridCheckBoxEditingElementDefaultStyle" BasedOn="{StaticResource DataGridCheckBoxElementDefaultStyle}" TargetType="{x:Type CheckBox}">
     <Setter Property="SnapsToDevicePixels" Value="True" />
   </Style>
-  <Style TargetType="{x:Type DataGridCheckBoxColumn}">
-    <Setter Property="ElementStyle" Value="{StaticResource DataGridCheckBoxElementDefaultStyle}" />
-    <Setter Property="EditingElementStyle" Value="{StaticResource DataGridCheckBoxEditingElementDefaultStyle}" />
-  </Style>
   <Style BasedOn="{StaticResource DefaultDataGridColumnHeadersPresenterStyle}" TargetType="{x:Type DataGridColumnHeadersPresenter}" />
   <Style BasedOn="{StaticResource DefaultDataGridStyle}" TargetType="{x:Type DataGrid}" />
   <Thickness x:Key="DatePickerBorderThemeThickness">1,1,1,0</Thickness>

diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.HC.xaml b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.HC.xaml
@@ -1550,7 +1550,6 @@
     </LinearGradientBrush.GradientStops>
   </LinearGradientBrush>
   <!--  END REMOVE COLORS  -->
-  <Style x:Key="DefaultDataGridCheckBoxColumnCellStyle" TargetType="{x:Type DataGridColumn}" />
   <Style x:Key="{ComponentResourceKey ResourceId=DataGridSelectAllButtonStyle, TypeInTargetAssembly={x:Type DataGrid}}" TargetType="{x:Type Button}">
     <Setter Property="OverridesDefaultStyle" Value="True" />
     <Setter Property="Template">
@@ -1879,9 +1878,6 @@
       </Trigger>
     </Style.Triggers>
   </Style>
-  <Style TargetType="{x:Type DataGridTextColumn}">
-    <Setter Property="EditingElementStyle" Value="{StaticResource TextBoxStyle}" />
-  </Style>
   <!--  Style and template for the DataGrid.  -->
   <Style x:Key="DefaultDataGridStyle" TargetType="{x:Type DataGrid}">
     <Setter Property="FocusVisualStyle" Value="{x:Null}" />
@@ -2085,10 +2081,6 @@
   <Style x:Key="DataGridCheckBoxEditingElementDefaultStyle" BasedOn="{StaticResource DataGridCheckBoxElementDefaultStyle}" TargetType="{x:Type CheckBox}">
     <Setter Property="SnapsToDevicePixels" Value="True" />
   </Style>
-  <Style TargetType="{x:Type DataGridCheckBoxColumn}">
-    <Setter Property="ElementStyle" Value="{StaticResource DataGridCheckBoxElementDefaultStyle}" />
-    <Setter Property="EditingElementStyle" Value="{StaticResource DataGridCheckBoxEditingElementDefaultStyle}" />
-  </Style>
   <Style BasedOn="{StaticResource DefaultDataGridColumnHeadersPresenterStyle}" TargetType="{x:Type DataGridColumnHeadersPresenter}" />
   <Style BasedOn="{StaticResource DefaultDataGridStyle}" TargetType="{x:Type DataGrid}" />
   <Thickness x:Key="DatePickerBorderThemeThickness">1,1,1,0</Thickness>

diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.Light.xaml b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.Light.xaml
@@ -1570,7 +1570,6 @@
     </LinearGradientBrush.GradientStops>
   </LinearGradientBrush>
   <!--  END REMOVE COLORS  -->
-  <Style x:Key="DefaultDataGridCheckBoxColumnCellStyle" TargetType="{x:Type DataGridColumn}" />
   <Style x:Key="{ComponentResourceKey ResourceId=DataGridSelectAllButtonStyle, TypeInTargetAssembly={x:Type DataGrid}}" TargetType="{x:Type Button}">
     <Setter Property="OverridesDefaultStyle" Value="True" />
     <Setter Property="Template">
@@ -1899,9 +1898,6 @@
       </Trigger>
     </Style.Triggers>
   </Style>
-  <Style TargetType="{x:Type DataGridTextColumn}">
-    <Setter Property="EditingElementStyle" Value="{StaticResource TextBoxStyle}" />
-  </Style>
   <!--  Style and template for the DataGrid.  -->
   <Style x:Key="DefaultDataGridStyle" TargetType="{x:Type DataGrid}">
     <Setter Property="FocusVisualStyle" Value="{x:Null}" />
@@ -2105,10 +2101,6 @@
   <Style x:Key="DataGridCheckBoxEditingElementDefaultStyle" BasedOn="{StaticResource DataGridCheckBoxElementDefaultStyle}" TargetType="{x:Type CheckBox}">
     <Setter Property="SnapsToDevicePixels" Value="True" />
   </Style>
-  <Style TargetType="{x:Type DataGridCheckBoxColumn}">
-    <Setter Property="ElementStyle" Value="{StaticResource DataGridCheckBoxElementDefaultStyle}" />
-    <Setter Property="EditingElementStyle" Value="{StaticResource DataGridCheckBoxEditingElementDefaultStyle}" />
-  </Style>
   <Style BasedOn="{StaticResource DefaultDataGridColumnHeadersPresenterStyle}" TargetType="{x:Type DataGridColumnHeadersPresenter}" />
   <Style BasedOn="{StaticResource DefaultDataGridStyle}" TargetType="{x:Type DataGrid}" />
   <Thickness x:Key="DatePickerBorderThemeThickness">1,1,1,0</Thickness>