Skip to content

Commit d530ee1

Browse files
dipeshmsftdipeshmsft
authored
Removing unnecessary comments in Fluent theme files (#10988)
1 parent 2cf1f9b commit d530ee1

File tree

10 files changed

+0
-70
lines changed

10 files changed

+0
-70
lines changed

‎src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/ComboBox.xaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,7 @@
129129
</Style>
130130

131131
<Style x:Key="DefaultComboBoxItemStyle" TargetType="{x:Type ComboBoxItem}">
132-
<!-- Universal WPF UI focus -->
133132
<Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
134-
<!-- Universal WPF UI focus -->
135133
<Setter Property="Foreground" Value="{DynamicResource ComboBoxForeground}" />
136134
<Setter Property="Background" Value="Transparent" />
137135
<Setter Property="Margin" Value="{StaticResource ComboBoxItemMargin}" />

‎src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/DataGrid.xaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -690,9 +690,7 @@
690690
<system:Double x:Key="DataGridCheckBoxWidth">22</system:Double>
691691

692692
<Style x:Key="DataGridCheckBoxElementDefaultStyle" TargetType="{x:Type CheckBox}">
693-
<!-- Universal WPF UI focus -->
694693
<Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
695-
<!-- Universal WPF UI focus -->
696694
<Setter Property="Background" Value="Transparent" />
697695
<Setter Property="Foreground">
698696
<Setter.Value>

‎src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/RadioButton.xaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@
2222
<Thickness x:Key="RadioButtonPadding">8,6,0,0</Thickness>
2323

2424
<Style x:Key="DefaultRadioButtonStyle" TargetType="{x:Type RadioButton}">
25-
<!-- Universal WPF UI focus -->
2625
<Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
27-
<!-- Universal WPF UI focus -->
2826
<Setter Property="Background" Value="{DynamicResource RadioButtonBackground}" />
2927
<Setter Property="Foreground" Value="{DynamicResource RadioButtonForeground}" />
3028
<Setter Property="BorderBrush" Value="{DynamicResource RadioButtonBorderBrush}" />

‎src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/RepeatButton.xaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
<Thickness x:Key="RepeatButtonIconMargin">0,0,8,0</Thickness>
1212

1313
<Style x:Key="DefaultRepeatButtonStyle" TargetType="{x:Type RepeatButton}">
14-
<!-- Universal WPF UI focus -->
1514
<Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
16-
<!-- Universal WPF UI focus -->
1715
<Setter Property="Background" Value="{DynamicResource RepeatButtonBackground}" />
1816
<Setter Property="Foreground" Value="{DynamicResource RepeatButtonForeground}" />
1917
<Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />

‎src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/ToggleButton.xaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515
<Thickness x:Key="ToggleButtonIconMargin">0,0,8,0</Thickness>
1616

1717
<Style x:Key="DefaultToggleButtonStyle" TargetType="{x:Type ToggleButton}">
18-
<!-- Universal WPF UI focus -->
1918
<Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
20-
<!-- Universal WPF UI focus -->
2119
<Setter Property="Background" Value="{DynamicResource ToggleButtonBackground}" />
2220
<Setter Property="Foreground" Value="{DynamicResource ToggleButtonForeground}" />
2321
<Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />

‎src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/TreeViewItem.xaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
<system:String x:Key="TreeViewChevronLeftGlyph">&#xE76B;</system:String>
1818

1919
<Style x:Key="ExpandCollapseToggleButtonStyle" TargetType="{x:Type ToggleButton}">
20-
<!-- Universal WPF UI focus -->
2120
<Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultCollectionFocusVisualStyle}" />
22-
<!-- Universal WPF UI focus -->
2321
<Setter Property="Focusable" Value="False" />
2422
<Setter Property="OverridesDefaultStyle" Value="True" />
2523
<Setter Property="SnapsToDevicePixels" Value="True" />
@@ -78,9 +76,7 @@
7876
</Style>
7977

8078
<Style x:Key="DefaultTreeViewItemStyle" TargetType="{x:Type TreeViewItem}">
81-
<!-- Universal WPF UI focus -->
8279
<Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultCollectionFocusVisualStyle}" />
83-
<!-- Universal WPF UI focus -->
8480
<Setter Property="Foreground" Value="{DynamicResource TreeViewItemForeground}" />
8581
<Setter Property="Background" Value="{DynamicResource TreeViewItemBackground}" />
8682
<Setter Property="Margin" Value="0,0,0,2" />

‎src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.Dark.xaml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1537,9 +1537,7 @@
15371537
</Setter>
15381538
</Style>
15391539
<Style x:Key="DefaultComboBoxItemStyle" TargetType="{x:Type ComboBoxItem}">
1540-
<!-- Universal WPF UI focus -->
15411540
<Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
1542-
<!-- Universal WPF UI focus -->
15431541
<Setter Property="Foreground" Value="{DynamicResource ComboBoxForeground}" />
15441542
<Setter Property="Background" Value="Transparent" />
15451543
<Setter Property="Margin" Value="{StaticResource ComboBoxItemMargin}" />
@@ -2354,9 +2352,7 @@
23542352
<system:Double x:Key="DataGridCheckBoxHeight">22</system:Double>
23552353
<system:Double x:Key="DataGridCheckBoxWidth">22</system:Double>
23562354
<Style x:Key="DataGridCheckBoxElementDefaultStyle" TargetType="{x:Type CheckBox}">
2357-
<!-- Universal WPF UI focus -->
23582355
<Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
2359-
<!-- Universal WPF UI focus -->
23602356
<Setter Property="Background" Value="Transparent" />
23612357
<Setter Property="Foreground">
23622358
<Setter.Value>
@@ -4266,9 +4262,7 @@
42664262
<system:Double x:Key="RadioButtonStrokeThickness">1</system:Double>
42674263
<Thickness x:Key="RadioButtonPadding">8,6,0,0</Thickness>
42684264
<Style x:Key="DefaultRadioButtonStyle" TargetType="{x:Type RadioButton}">
4269-
<!-- Universal WPF UI focus -->
42704265
<Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
4271-
<!-- Universal WPF UI focus -->
42724266
<Setter Property="Background" Value="{DynamicResource RadioButtonBackground}" />
42734267
<Setter Property="Foreground" Value="{DynamicResource RadioButtonForeground}" />
42744268
<Setter Property="BorderBrush" Value="{DynamicResource RadioButtonBorderBrush}" />
@@ -4421,9 +4415,7 @@
44214415
<Thickness x:Key="RepeatButtonBorderThemeThickness">1</Thickness>
44224416
<Thickness x:Key="RepeatButtonIconMargin">0,0,8,0</Thickness>
44234417
<Style x:Key="DefaultRepeatButtonStyle" TargetType="{x:Type RepeatButton}">
4424-
<!-- Universal WPF UI focus -->
44254418
<Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
4426-
<!-- Universal WPF UI focus -->
44274419
<Setter Property="Background" Value="{DynamicResource RepeatButtonBackground}" />
44284420
<Setter Property="Foreground" Value="{DynamicResource RepeatButtonForeground}" />
44294421
<Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
@@ -5414,9 +5406,7 @@
54145406
<Thickness x:Key="ToggleButtonBorderThemeThickness">1</Thickness>
54155407
<Thickness x:Key="ToggleButtonIconMargin">0,0,8,0</Thickness>
54165408
<Style x:Key="DefaultToggleButtonStyle" TargetType="{x:Type ToggleButton}">
5417-
<!-- Universal WPF UI focus -->
54185409
<Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
5419-
<!-- Universal WPF UI focus -->
54205410
<Setter Property="Background" Value="{DynamicResource ToggleButtonBackground}" />
54215411
<Setter Property="Foreground" Value="{DynamicResource ToggleButtonForeground}" />
54225412
<Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
@@ -5746,9 +5736,7 @@
57465736
<system:String x:Key="TreeViewChevronRightGlyph"></system:String>
57475737
<system:String x:Key="TreeViewChevronLeftGlyph"></system:String>
57485738
<Style x:Key="ExpandCollapseToggleButtonStyle" TargetType="{x:Type ToggleButton}">
5749-
<!-- Universal WPF UI focus -->
57505739
<Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultCollectionFocusVisualStyle}" />
5751-
<!-- Universal WPF UI focus -->
57525740
<Setter Property="Focusable" Value="False" />
57535741
<Setter Property="OverridesDefaultStyle" Value="True" />
57545742
<Setter Property="SnapsToDevicePixels" Value="True" />
@@ -5787,9 +5775,7 @@
57875775
</Setter>
57885776
</Style>
57895777
<Style x:Key="DefaultTreeViewItemStyle" TargetType="{x:Type TreeViewItem}">
5790-
<!-- Universal WPF UI focus -->
57915778
<Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultCollectionFocusVisualStyle}" />
5792-
<!-- Universal WPF UI focus -->
57935779
<Setter Property="Foreground" Value="{DynamicResource TreeViewItemForeground}" />
57945780
<Setter Property="Background" Value="{DynamicResource TreeViewItemBackground}" />
57955781
<Setter Property="Margin" Value="0,0,0,2" />

‎src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.HC.xaml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1437,9 +1437,7 @@
14371437
</Setter>
14381438
</Style>
14391439
<Style x:Key="DefaultComboBoxItemStyle" TargetType="{x:Type ComboBoxItem}">
1440-
<!-- Universal WPF UI focus -->
14411440
<Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
1442-
<!-- Universal WPF UI focus -->
14431441
<Setter Property="Foreground" Value="{DynamicResource ComboBoxForeground}" />
14441442
<Setter Property="Background" Value="Transparent" />
14451443
<Setter Property="Margin" Value="{StaticResource ComboBoxItemMargin}" />
@@ -2254,9 +2252,7 @@
22542252
<system:Double x:Key="DataGridCheckBoxHeight">22</system:Double>
22552253
<system:Double x:Key="DataGridCheckBoxWidth">22</system:Double>
22562254
<Style x:Key="DataGridCheckBoxElementDefaultStyle" TargetType="{x:Type CheckBox}">
2257-
<!-- Universal WPF UI focus -->
22582255
<Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
2259-
<!-- Universal WPF UI focus -->
22602256
<Setter Property="Background" Value="Transparent" />
22612257
<Setter Property="Foreground">
22622258
<Setter.Value>
@@ -4166,9 +4162,7 @@
41664162
<system:Double x:Key="RadioButtonStrokeThickness">1</system:Double>
41674163
<Thickness x:Key="RadioButtonPadding">8,6,0,0</Thickness>
41684164
<Style x:Key="DefaultRadioButtonStyle" TargetType="{x:Type RadioButton}">
4169-
<!-- Universal WPF UI focus -->
41704165
<Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
4171-
<!-- Universal WPF UI focus -->
41724166
<Setter Property="Background" Value="{DynamicResource RadioButtonBackground}" />
41734167
<Setter Property="Foreground" Value="{DynamicResource RadioButtonForeground}" />
41744168
<Setter Property="BorderBrush" Value="{DynamicResource RadioButtonBorderBrush}" />
@@ -4321,9 +4315,7 @@
43214315
<Thickness x:Key="RepeatButtonBorderThemeThickness">1</Thickness>
43224316
<Thickness x:Key="RepeatButtonIconMargin">0,0,8,0</Thickness>
43234317
<Style x:Key="DefaultRepeatButtonStyle" TargetType="{x:Type RepeatButton}">
4324-
<!-- Universal WPF UI focus -->
43254318
<Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
4326-
<!-- Universal WPF UI focus -->
43274319
<Setter Property="Background" Value="{DynamicResource RepeatButtonBackground}" />
43284320
<Setter Property="Foreground" Value="{DynamicResource RepeatButtonForeground}" />
43294321
<Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
@@ -5314,9 +5306,7 @@
53145306
<Thickness x:Key="ToggleButtonBorderThemeThickness">1</Thickness>
53155307
<Thickness x:Key="ToggleButtonIconMargin">0,0,8,0</Thickness>
53165308
<Style x:Key="DefaultToggleButtonStyle" TargetType="{x:Type ToggleButton}">
5317-
<!-- Universal WPF UI focus -->
53185309
<Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
5319-
<!-- Universal WPF UI focus -->
53205310
<Setter Property="Background" Value="{DynamicResource ToggleButtonBackground}" />
53215311
<Setter Property="Foreground" Value="{DynamicResource ToggleButtonForeground}" />
53225312
<Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
@@ -5646,9 +5636,7 @@
56465636
<system:String x:Key="TreeViewChevronRightGlyph"></system:String>
56475637
<system:String x:Key="TreeViewChevronLeftGlyph"></system:String>
56485638
<Style x:Key="ExpandCollapseToggleButtonStyle" TargetType="{x:Type ToggleButton}">
5649-
<!-- Universal WPF UI focus -->
56505639
<Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultCollectionFocusVisualStyle}" />
5651-
<!-- Universal WPF UI focus -->
56525640
<Setter Property="Focusable" Value="False" />
56535641
<Setter Property="OverridesDefaultStyle" Value="True" />
56545642
<Setter Property="SnapsToDevicePixels" Value="True" />
@@ -5687,9 +5675,7 @@
56875675
</Setter>
56885676
</Style>
56895677
<Style x:Key="DefaultTreeViewItemStyle" TargetType="{x:Type TreeViewItem}">
5690-
<!-- Universal WPF UI focus -->
56915678
<Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultCollectionFocusVisualStyle}" />
5692-
<!-- Universal WPF UI focus -->
56935679
<Setter Property="Foreground" Value="{DynamicResource TreeViewItemForeground}" />
56945680
<Setter Property="Background" Value="{DynamicResource TreeViewItemBackground}" />
56955681
<Setter Property="Margin" Value="0,0,0,2" />

‎src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.Light.xaml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1552,9 +1552,7 @@
15521552
</Setter>
15531553
</Style>
15541554
<Style x:Key="DefaultComboBoxItemStyle" TargetType="{x:Type ComboBoxItem}">
1555-
<!-- Universal WPF UI focus -->
15561555
<Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
1557-
<!-- Universal WPF UI focus -->
15581556
<Setter Property="Foreground" Value="{DynamicResource ComboBoxForeground}" />
15591557
<Setter Property="Background" Value="Transparent" />
15601558
<Setter Property="Margin" Value="{StaticResource ComboBoxItemMargin}" />
@@ -2369,9 +2367,7 @@
23692367
<system:Double x:Key="DataGridCheckBoxHeight">22</system:Double>
23702368
<system:Double x:Key="DataGridCheckBoxWidth">22</system:Double>
23712369
<Style x:Key="DataGridCheckBoxElementDefaultStyle" TargetType="{x:Type CheckBox}">
2372-
<!-- Universal WPF UI focus -->
23732370
<Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
2374-
<!-- Universal WPF UI focus -->
23752371
<Setter Property="Background" Value="Transparent" />
23762372
<Setter Property="Foreground">
23772373
<Setter.Value>
@@ -4281,9 +4277,7 @@
42814277
<system:Double x:Key="RadioButtonStrokeThickness">1</system:Double>
42824278
<Thickness x:Key="RadioButtonPadding">8,6,0,0</Thickness>
42834279
<Style x:Key="DefaultRadioButtonStyle" TargetType="{x:Type RadioButton}">
4284-
<!-- Universal WPF UI focus -->
42854280
<Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
4286-
<!-- Universal WPF UI focus -->
42874281
<Setter Property="Background" Value="{DynamicResource RadioButtonBackground}" />
42884282
<Setter Property="Foreground" Value="{DynamicResource RadioButtonForeground}" />
42894283
<Setter Property="BorderBrush" Value="{DynamicResource RadioButtonBorderBrush}" />
@@ -4436,9 +4430,7 @@
44364430
<Thickness x:Key="RepeatButtonBorderThemeThickness">1</Thickness>
44374431
<Thickness x:Key="RepeatButtonIconMargin">0,0,8,0</Thickness>
44384432
<Style x:Key="DefaultRepeatButtonStyle" TargetType="{x:Type RepeatButton}">
4439-
<!-- Universal WPF UI focus -->
44404433
<Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
4441-
<!-- Universal WPF UI focus -->
44424434
<Setter Property="Background" Value="{DynamicResource RepeatButtonBackground}" />
44434435
<Setter Property="Foreground" Value="{DynamicResource RepeatButtonForeground}" />
44444436
<Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
@@ -5429,9 +5421,7 @@
54295421
<Thickness x:Key="ToggleButtonBorderThemeThickness">1</Thickness>
54305422
<Thickness x:Key="ToggleButtonIconMargin">0,0,8,0</Thickness>
54315423
<Style x:Key="DefaultToggleButtonStyle" TargetType="{x:Type ToggleButton}">
5432-
<!-- Universal WPF UI focus -->
54335424
<Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
5434-
<!-- Universal WPF UI focus -->
54355425
<Setter Property="Background" Value="{DynamicResource ToggleButtonBackground}" />
54365426
<Setter Property="Foreground" Value="{DynamicResource ToggleButtonForeground}" />
54375427
<Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
@@ -5761,9 +5751,7 @@
57615751
<system:String x:Key="TreeViewChevronRightGlyph"></system:String>
57625752
<system:String x:Key="TreeViewChevronLeftGlyph"></system:String>
57635753
<Style x:Key="ExpandCollapseToggleButtonStyle" TargetType="{x:Type ToggleButton}">
5764-
<!-- Universal WPF UI focus -->
57655754
<Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultCollectionFocusVisualStyle}" />
5766-
<!-- Universal WPF UI focus -->
57675755
<Setter Property="Focusable" Value="False" />
57685756
<Setter Property="OverridesDefaultStyle" Value="True" />
57695757
<Setter Property="SnapsToDevicePixels" Value="True" />
@@ -5802,9 +5790,7 @@
58025790
</Setter>
58035791
</Style>
58045792
<Style x:Key="DefaultTreeViewItemStyle" TargetType="{x:Type TreeViewItem}">
5805-
<!-- Universal WPF UI focus -->
58065793
<Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultCollectionFocusVisualStyle}" />
5807-
<!-- Universal WPF UI focus -->
58085794
<Setter Property="Foreground" Value="{DynamicResource TreeViewItemForeground}" />
58095795
<Setter Property="Background" Value="{DynamicResource TreeViewItemBackground}" />
58105796
<Setter Property="Margin" Value="0,0,0,2" />

0 commit comments

Comments
 (0)