Skip to content

Commit 0875565

Browse files
dipeshmsftdipeshmsft
authored
Add missing Bindings in Fluent ControlTemplates (#9786)
* Fixing TemplateBindings in Fluent styles * Fixing other issues in TemplateBinding * Fixing more issues in Fluent styles
1 parent 2d3896e commit 0875565

23 files changed

+859
-484
lines changed

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

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,7 @@
429429
<SolidColorBrush x:Key="DatePickerFocusedBorderBrush" Color="{StaticResource SystemAccentColorLight2}" />
430430
<SolidColorBrush x:Key="DatePickerBackgroundFocused" Color="{StaticResource ControlFillColorInputActive}" />
431431
<SolidColorBrush x:Key="DatePickerBackgroundPointerOver" Color="{StaticResource ControlFillColorSecondary}" />
432+
<SolidColorBrush x:Key="DatePickerPopupBackground" Color="{StaticResource AcrylicBackgroundFillColorDefault}"/>
432433

433434
<!-- DynamicScrollBar -->
434435
<SolidColorBrush x:Key="ScrollBarButtonBackground" Color="{StaticResource SubtleFillColorTransparent}" />
@@ -480,7 +481,7 @@
480481
<SolidColorBrush x:Key="InfoBarInformationalSeverityIconBackground" Color="{StaticResource SystemAccentColor}" />
481482

482483
<!-- Label -->
483-
<SolidColorBrush x:Key="LabelForeground" Color="{StaticResource TextFillColorSecondary}" />
484+
<SolidColorBrush x:Key="LabelForeground" Color="{StaticResource TextFillColorPrimary}" />
484485

485486
<!-- ListBox -->
486487
<SolidColorBrush x:Key="ListBoxBackground" Color="{StaticResource CardBackgroundFillColorDefault}" />
@@ -492,6 +493,8 @@
492493
<SolidColorBrush x:Key="ListBoxItemUnselectedBackgroundPointerOverThemeBrush" Color="{StaticResource ControlAltFillColorTertiary}" />
493494

494495
<!-- ListView -->
496+
<SolidColorBrush x:Key="ListViewBackground" Color="{StaticResource SubtleFillColorTransparent}" />
497+
<SolidColorBrush x:Key="ListViewBorderBrush" Color="{StaticResource SubtleFillColorTransparent}" />
495498
<SolidColorBrush x:Key="ListViewItemForeground" Color="{StaticResource TextFillColorPrimary}" />
496499
<SolidColorBrush x:Key="ListViewItemPillFillBrush" Color="{StaticResource SystemAccentColorLight2}" />
497500
<SolidColorBrush x:Key="ListViewItemBackgroundPointerOver" Color="{StaticResource SubtleFillColorSecondary}" />
@@ -532,6 +535,10 @@
532535
<SolidColorBrush x:Key="NavigationViewItemForegroundLeftFluent" Color="{StaticResource TextFillColorPrimary}" />
533536
<SolidColorBrush x:Key="NavigationViewItemForegroundPointerOverLeftFluent" Color="{StaticResource TextFillColorPrimary}" />
534537

538+
<!-- Page -->
539+
<SolidColorBrush x:Key="PageForeground" Color="{StaticResource TextFillColorPrimary}" />
540+
<SolidColorBrush x:Key="PageBackground" Color="{StaticResource SubtleFillColorTransparent}" />
541+
535542
<!-- ProgressBar -->
536543
<SolidColorBrush x:Key="ProgressBarForeground" Color="{StaticResource SystemAccentColorLight2}" />
537544
<SolidColorBrush x:Key="ProgressBarBackground" Color="{StaticResource ControlStrongStrokeColorDefault}" />
@@ -546,7 +553,13 @@
546553
<!-- RadioButton -->
547554
<SolidColorBrush x:Key="RadioButtonForeground" Color="{StaticResource TextFillColorPrimary}" />
548555
<SolidColorBrush x:Key="RadioButtonForegroundDisabled" Color="{StaticResource TextFillColorDisabled}" />
556+
<SolidColorBrush x:Key="RadioButtonBackground" Color="{StaticResource SubtleFillColorTransparent}"/>
557+
<SolidColorBrush x:Key="RadioButtonBackgroundPointerOver" Color="{StaticResource SubtleFillColorTransparent}"/>
558+
<SolidColorBrush x:Key="RadioButtonBackgroundPressed" Color="{StaticResource SubtleFillColorTransparent}"/>
549559
<SolidColorBrush x:Key="RadioButtonBackgroundDisabled" Color="{StaticResource TextFillColorDisabled}" />
560+
<SolidColorBrush x:Key="RadioButtonBorderBrush" Color="{StaticResource SubtleFillColorTransparent}"/>
561+
<SolidColorBrush x:Key="RadioButtonBorderBrushPointerOver" Color="{StaticResource SubtleFillColorTransparent}"/>
562+
<SolidColorBrush x:Key="RadioButtonBorderBrushPressed" Color="{StaticResource SubtleFillColorTransparent}"/>
550563
<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedStroke" Color="{StaticResource SystemAccentColorLight2}" />
551564
<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedStrokePointerOver" Color="{StaticResource SystemAccentColorLight2}" Opacity="0.9" />
552565
<SolidColorBrush x:Key="RadioButtonCheckGlyphFill" Color="{StaticResource TextOnAccentFillColorPrimary}" />
@@ -558,8 +571,10 @@
558571
<SolidColorBrush x:Key="RadioButtonOuterEllipseFillPressed" Color="{StaticResource ControlAltFillColorQuarternary}" />
559572
<SolidColorBrush x:Key="RadioButtonOuterEllipseFillDisabled" Color="{StaticResource ControlAltFillColorDisabled}" />
560573
<SolidColorBrush x:Key="RadioButtonOuterEllipseStroke" Color="{StaticResource ControlStrongStrokeColorDefault}" />
574+
<SolidColorBrush x:Key="RadioButtonOuterEllipseStrokePointerOver" Color="{StaticResource ControlStrongStrokeColorDefault}" />
561575
<SolidColorBrush x:Key="RadioButtonOuterEllipseStrokePressed" Color="{StaticResource ControlStrongStrokeColorDisabled}" />
562576
<SolidColorBrush x:Key="RadioButtonOuterEllipseStrokeDisabled" Color="{StaticResource ControlStrongStrokeColorDisabled}" />
577+
<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedFill" Color="{StaticResource SystemAccentColorLight2}"/>
563578

564579
<!-- RatingControl -->
565580
<SolidColorBrush x:Key="RatingControlSelectedForeground" Color="{StaticResource SystemAccentColorLight2}" />
@@ -575,6 +590,11 @@
575590
<SolidColorBrush x:Key="RepeatButtonForegroundPressed" Color="{StaticResource TextFillColorSecondary}" />
576591
<SolidColorBrush x:Key="RepeatButtonForegroundDisabled" Color="{StaticResource TextFillColorDisabled}" />
577592

593+
<!-- ScrollBar -->
594+
<SolidColorBrush x:Key="ScrollBarTrackFill" Color="{StaticResource SubtleFillColorTransparent}" />
595+
<SolidColorBrush x:Key="ScrollBarTrackStroke" Color="{StaticResource SubtleFillColorTransparent}" />
596+
<SolidColorBrush x:Key="ScrollBarTrackFillPointerOver" Color="{StaticResource AcrylicBackgroundFillColorDefault}" />
597+
578598
<!-- Separator -->
579599
<SolidColorBrush x:Key="SeparatorBorderBrush" Color="{StaticResource DividerStrokeColorDefault}" />
580600

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,7 @@
298298
<SolidColorBrush x:Key="DatePickerFocusedBorderBrush" Color="{StaticResource SystemColorHighlightColor}" />
299299
<SolidColorBrush x:Key="DatePickerBackgroundFocused" Color="{StaticResource SystemColorHighlightTextColor}" />
300300
<SolidColorBrush x:Key="DatePickerBackgroundPointerOver" Color="{StaticResource SystemColorHighlightTextColor}" />
301+
<SolidColorBrush x:Key="DatePickerPopupBackground" Color="{StaticResource SystemColorWindowColor}"/>
301302

302303
<!-- DynamicScrollBar -->
303304
<SolidColorBrush x:Key="ScrollBarButtonBackground" Color="Transparent" />
@@ -360,6 +361,8 @@
360361
<SolidColorBrush x:Key="ListBoxItemUnselectedBackgroundPointerOverThemeBrush" Color="{StaticResource SystemColorHighlightTextColor}" />
361362

362363
<!-- ListView -->
364+
<SolidColorBrush x:Key="ListViewBackground" Color="Transparent" />
365+
<SolidColorBrush x:Key="ListViewBorderBrush" Color="Transparent" />
363366
<SolidColorBrush x:Key="ListViewItemForeground" Color="{StaticResource SystemColorWindowTextColor}" />
364367
<SolidColorBrush x:Key="ListViewItemPillFillBrush" Color="{StaticResource SystemColorHighlightColor}" />
365368
<SolidColorBrush x:Key="ListViewItemBackgroundPointerOver" Color="{StaticResource SystemColorWindowColor}" />
@@ -400,6 +403,10 @@
400403
<SolidColorBrush x:Key="NavigationViewItemForegroundLeftFluent" Color="{StaticResource SystemColorWindowTextColor}" />
401404
<SolidColorBrush x:Key="NavigationViewItemForegroundPointerOverLeftFluent" Color="{StaticResource SystemColorWindowTextColor}" />
402405

406+
<!-- Page -->
407+
<SolidColorBrush x:Key="PageForeground" Color="{StaticResource SystemColorWindowTextColor}" />
408+
<SolidColorBrush x:Key="PageBackground" Color="Transparent" />
409+
403410
<!-- ProgressBar -->
404411
<SolidColorBrush x:Key="ProgressBarForeground" Color="{StaticResource SystemColorHighlightColor}" />
405412
<SolidColorBrush x:Key="ProgressBarBackground" Color="{StaticResource SystemColorWindowColor}" />
@@ -415,7 +422,13 @@
415422
<!-- RadioButton -->
416423
<SolidColorBrush x:Key="RadioButtonForeground" Color="{StaticResource SystemColorButtonTextColor}" />
417424
<SolidColorBrush x:Key="RadioButtonForegroundDisabled" Color="{StaticResource SystemColorGrayTextColor}" />
425+
<SolidColorBrush x:Key="RadioButtonBackground" Color="Transparent"/>
426+
<SolidColorBrush x:Key="RadioButtonBackgroundPointerOver" Color="Transparent"/>
427+
<SolidColorBrush x:Key="RadioButtonBackgroundPressed" Color="Transparent"/>
418428
<SolidColorBrush x:Key="RadioButtonBackgroundDisabled" Color="{StaticResource SystemColorGrayTextColor}" />
429+
<SolidColorBrush x:Key="RadioButtonBorderBrush" Color="Transparent"/>
430+
<SolidColorBrush x:Key="RadioButtonBorderBrushPointerOver" Color="Transparent"/>
431+
<SolidColorBrush x:Key="RadioButtonBorderBrushPressed" Color="Transparent"/>
419432
<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedStroke" Color="{StaticResource SystemColorHighlightColor}" />
420433
<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedStrokePointerOver" Color="{StaticResource SystemColorButtonTextColor}" />
421434
<SolidColorBrush x:Key="RadioButtonCheckGlyphFill" Color="{StaticResource SystemColorHighlightColor}" />
@@ -427,8 +440,10 @@
427440
<SolidColorBrush x:Key="RadioButtonOuterEllipseFillPressed" Color="{StaticResource SystemColorHighlightTextColor}" />
428441
<SolidColorBrush x:Key="RadioButtonOuterEllipseFillDisabled" Color="{StaticResource SystemColorWindowColor}" />
429442
<SolidColorBrush x:Key="RadioButtonOuterEllipseStroke" Color="{StaticResource SystemColorButtonTextColor}" />
443+
<SolidColorBrush x:Key="RadioButtonOuterEllipseStrokePointerOver" Color="{StaticResource SystemColorHighlightColor}" />
430444
<SolidColorBrush x:Key="RadioButtonOuterEllipseStrokePressed" Color="{StaticResource SystemColorHighlightTextColor}" />
431445
<SolidColorBrush x:Key="RadioButtonOuterEllipseStrokeDisabled" Color="{StaticResource SystemColorGrayTextColor}" />
446+
<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedFill" Color="{StaticResource SystemColorHighlightColor}"/>
432447

433448
<!-- RatingControl -->
434449
<SolidColorBrush x:Key="RatingControlSelectedForeground" Color="{StaticResource SystemColorHighlightColor}" />
@@ -444,6 +459,11 @@
444459
<SolidColorBrush x:Key="RepeatButtonForegroundPressed" Color="{StaticResource SystemColorHighlightColor}" />
445460
<SolidColorBrush x:Key="RepeatButtonForegroundDisabled" Color="{StaticResource SystemColorGrayTextColor}" />
446461

462+
<!-- ScrollBar -->
463+
<SolidColorBrush x:Key="ScrollBarTrackFill" Color="Transparent" />
464+
<SolidColorBrush x:Key="ScrollBarTrackStroke" Color="{StaticResource SystemColorWindowTextColor}" />
465+
<SolidColorBrush x:Key="ScrollBarTrackFillPointerOver" Color="{StaticResource SystemColorWindowColor}" />
466+
447467
<!-- Separator -->
448468
<SolidColorBrush x:Key="SeparatorBorderBrush" Color="{StaticResource SystemColorWindowTextColor}" />
449469

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

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,7 @@
423423
<SolidColorBrush x:Key="DatePickerFocusedBorderBrush" Color="{StaticResource SystemAccentColorDark1}" />
424424
<SolidColorBrush x:Key="DatePickerBackgroundFocused" Color="{StaticResource ControlFillColorInputActive}" />
425425
<SolidColorBrush x:Key="DatePickerBackgroundPointerOver" Color="{StaticResource ControlFillColorSecondary}" />
426+
<SolidColorBrush x:Key="DatePickerPopupBackground" Color="{StaticResource AcrylicBackgroundFillColorDefault}"/>
426427

427428
<!-- DynamicScrollBar -->
428429
<SolidColorBrush x:Key="ScrollBarButtonBackground" Color="{StaticResource SubtleFillColorTransparent}" />
@@ -474,7 +475,7 @@
474475
<SolidColorBrush x:Key="InfoBarInformationalSeverityIconBackground" Color="{StaticResource SystemAccentColor}" />
475476

476477
<!-- Label -->
477-
<SolidColorBrush x:Key="LabelForeground" Color="{StaticResource TextFillColorSecondary}" />
478+
<SolidColorBrush x:Key="LabelForeground" Color="{StaticResource TextFillColorPrimary}" />
478479

479480
<!-- ListBox -->
480481
<Color x:Key="SystemChromeMediumLowColor">#FFF2F2F2</Color>
@@ -487,6 +488,8 @@
487488
<SolidColorBrush x:Key="ListBoxItemUnselectedBackgroundPointerOverThemeBrush" Color="{StaticResource ControlAltFillColorTertiary}" />
488489

489490
<!-- ListView -->
491+
<SolidColorBrush x:Key="ListViewBackground" Color="{StaticResource SubtleFillColorTransparent}" />
492+
<SolidColorBrush x:Key="ListViewBorderBrush" Color="{StaticResource SubtleFillColorTransparent}" />
490493
<SolidColorBrush x:Key="ListViewItemForeground" Color="{StaticResource TextFillColorPrimary}" />
491494
<SolidColorBrush x:Key="ListViewItemPillFillBrush" Color="{StaticResource SystemAccentColorDark1}" />
492495
<SolidColorBrush x:Key="ListViewItemBackgroundPointerOver" Color="{StaticResource SubtleFillColorSecondary}" />
@@ -527,6 +530,10 @@
527530
<SolidColorBrush x:Key="NavigationViewItemForegroundLeftFluent" Color="{StaticResource TextFillColorPrimary}" />
528531
<SolidColorBrush x:Key="NavigationViewItemForegroundPointerOverLeftFluent" Color="{StaticResource TextFillColorPrimary}" />
529532

533+
<!-- Page -->
534+
<SolidColorBrush x:Key="PageForeground" Color="{StaticResource TextFillColorPrimary}" />
535+
<SolidColorBrush x:Key="PageBackground" Color="{StaticResource SubtleFillColorTransparent}" />
536+
530537
<!-- ProgressBar -->
531538
<SolidColorBrush x:Key="ProgressBarForeground" Color="{StaticResource SystemAccentColorDark1}" />
532539
<SolidColorBrush x:Key="ProgressBarBackground" Color="{StaticResource ControlStrongStrokeColorDefault}" />
@@ -541,7 +548,13 @@
541548
<!-- RadioButton -->
542549
<SolidColorBrush x:Key="RadioButtonForeground" Color="{StaticResource TextFillColorPrimary}" />
543550
<SolidColorBrush x:Key="RadioButtonForegroundDisabled" Color="{StaticResource TextFillColorDisabled}" />
551+
<SolidColorBrush x:Key="RadioButtonBackground" Color="{StaticResource SubtleFillColorTransparent}"/>
552+
<SolidColorBrush x:Key="RadioButtonBackgroundPointerOver" Color="{StaticResource SubtleFillColorTransparent}"/>
553+
<SolidColorBrush x:Key="RadioButtonBackgroundPressed" Color="{StaticResource SubtleFillColorTransparent}"/>
544554
<SolidColorBrush x:Key="RadioButtonBackgroundDisabled" Color="{StaticResource TextFillColorDisabled}" />
555+
<SolidColorBrush x:Key="RadioButtonBorderBrush" Color="{StaticResource SubtleFillColorTransparent}"/>
556+
<SolidColorBrush x:Key="RadioButtonBorderBrushPointerOver" Color="{StaticResource SubtleFillColorTransparent}"/>
557+
<SolidColorBrush x:Key="RadioButtonBorderBrushPressed" Color="{StaticResource SubtleFillColorTransparent}"/>
545558
<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedStroke" Color="{StaticResource SystemAccentColorDark1}" />
546559
<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedStrokePointerOver" Color="{StaticResource SystemAccentColorDark1}" Opacity="0.9" />
547560
<SolidColorBrush x:Key="RadioButtonCheckGlyphFill" Color="{StaticResource TextOnAccentFillColorPrimary}" />
@@ -553,8 +566,10 @@
553566
<SolidColorBrush x:Key="RadioButtonOuterEllipseFillPressed" Color="{StaticResource ControlAltFillColorQuarternary}" />
554567
<SolidColorBrush x:Key="RadioButtonOuterEllipseFillDisabled" Color="{StaticResource ControlAltFillColorDisabled}" />
555568
<SolidColorBrush x:Key="RadioButtonOuterEllipseStroke" Color="{StaticResource ControlStrongStrokeColorDefault}" />
569+
<SolidColorBrush x:Key="RadioButtonOuterEllipseStrokePointerOver" Color="{StaticResource ControlStrongStrokeColorDefault}" />
556570
<SolidColorBrush x:Key="RadioButtonOuterEllipseStrokePressed" Color="{StaticResource ControlStrongStrokeColorDisabled}" />
557571
<SolidColorBrush x:Key="RadioButtonOuterEllipseStrokeDisabled" Color="{StaticResource ControlStrongStrokeColorDisabled}" />
572+
<SolidColorBrush x:Key="RadioButtonOuterEllipseCheckedFill" Color="{StaticResource SystemAccentColorDark1}"/>
558573

559574
<!-- RatingControl -->
560575
<SolidColorBrush x:Key="RatingControlSelectedForeground" Color="{StaticResource SystemAccentColorDark1}" />
@@ -570,6 +585,11 @@
570585
<SolidColorBrush x:Key="RepeatButtonForegroundPressed" Color="{StaticResource TextFillColorSecondary}" />
571586
<SolidColorBrush x:Key="RepeatButtonForegroundDisabled" Color="{StaticResource TextFillColorDisabled}" />
572587

588+
<!-- ScrollBar -->
589+
<SolidColorBrush x:Key="ScrollBarTrackFill" Color="{StaticResource SubtleFillColorTransparent}" />
590+
<SolidColorBrush x:Key="ScrollBarTrackStroke" Color="{StaticResource SubtleFillColorTransparent}" />
591+
<SolidColorBrush x:Key="ScrollBarTrackFillPointerOver" Color="{StaticResource AcrylicBackgroundFillColorDefault}" />
592+
573593
<!-- Separator -->
574594
<SolidColorBrush x:Key="SeparatorBorderBrush" Color="{StaticResource DividerStrokeColorDefault}" />
575595

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<Setter Property="OverridesDefaultStyle" Value="True" />
3434
<Setter Property="Template">
3535
<Setter.Value>
36-
<ControlTemplate TargetType="{x:Type Button}">
36+
<ControlTemplate TargetType="{x:Type ButtonBase}">
3737
<Border x:Name="ContentBorder"
3838
Width="{TemplateBinding Width}"
3939
Height="{TemplateBinding Height}"

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -486,21 +486,21 @@
486486
<Setter Property="CalendarDayButtonStyle" Value="{StaticResource DefaultCalendarDayButtonStyle}" />
487487
<Setter Property="CalendarItemStyle" Value="{StaticResource DefaultCalendarItemStyle}" />
488488
<Setter Property="Foreground" Value="{DynamicResource CalendarViewForeground}" />
489-
<Setter Property="Background" Value="Transparent" />
490-
<Setter Property="BorderBrush" Value="Transparent" />
489+
<Setter Property="Background" Value="{DynamicResource CalendarViewBackground}" />
490+
<Setter Property="BorderBrush" Value="{DynamicResource CalendarViewBorderBrush}" />
491491
<Setter Property="HorizontalAlignment" Value="Center" />
492492
<Setter Property="VerticalAlignment" Value="Center" />
493-
<Setter Property="BorderThickness" Value="0" />
493+
<Setter Property="BorderThickness" Value="1" />
494494
<Setter Property="Template">
495495
<Setter.Value>
496496
<ControlTemplate TargetType="{x:Type Calendar}">
497497
<Border
498498
x:Name="PART_Root"
499499
Margin="0"
500500
Padding="0"
501-
Background="{DynamicResource CalendarViewBackground}"
502-
BorderBrush="{DynamicResource CalendarViewBorderBrush}"
503-
BorderThickness="1"
501+
Background="{TemplateBinding Background}"
502+
BorderBrush="{TemplateBinding BorderBrush}"
503+
BorderThickness="{TemplateBinding BorderThickness}"
504504
HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
505505
VerticalAlignment="{TemplateBinding VerticalAlignment}"
506506
CornerRadius="4">
@@ -510,9 +510,9 @@
510510
Padding="0"
511511
HorizontalAlignment="Stretch"
512512
VerticalAlignment="Stretch"
513-
Background="{TemplateBinding Background}"
514-
BorderBrush="{TemplateBinding BorderBrush}"
515-
BorderThickness="{TemplateBinding BorderThickness}"
513+
Background="Transparent"
514+
BorderBrush="Transparent"
515+
BorderThickness="0"
516516
Style="{TemplateBinding CalendarItemStyle}" />
517517
</Border>
518518
</ControlTemplate>

0 commit comments

Comments
 (0)