File tree Expand file tree Collapse file tree 7 files changed +30
-3
lines changed
src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent Expand file tree Collapse file tree 7 files changed +30
-3
lines changed Original file line number Diff line number Diff line change 790
790
791
791
<!-- Thumb -->
792
792
<SolidColorBrush x : Key =" ThumbBackground" Color =" {StaticResource ControlStrongFillColorDefault}" />
793
+ <SolidColorBrush x : Key =" ThumbBackgroundDisabled" Color =" {StaticResource ControlStrongFillColorDisabled}" />
793
794
794
795
<!-- ThumbRate -->
795
796
<SolidColorBrush x : Key =" ThumbRateForeground" Color =" {StaticResource SystemAccentColorLight3}" />
Original file line number Diff line number Diff line change 596
596
597
597
<!-- Thumb -->
598
598
<SolidColorBrush x : Key =" ThumbBackground" Color =" {StaticResource SystemColorButtonTextColor}" />
599
+ <SolidColorBrush x : Key =" ThumbBackgroundDisabled" Color =" {StaticResource SystemColorButtonFaceColor}" />
599
600
600
601
<!-- ThumbRate -->
601
602
<SolidColorBrush x : Key =" ThumbRateForeground" Color =" {StaticResource SystemColorHighlightColor}" />
Original file line number Diff line number Diff line change 799
799
800
800
<!-- Thumb -->
801
801
<SolidColorBrush x : Key =" ThumbBackground" Color =" {StaticResource ControlStrongFillColorDefault}" />
802
+ <SolidColorBrush x : Key =" ThumbBackgroundDisabled" Color =" {StaticResource ControlStrongFillColorDisabled}" />
802
803
803
804
<!-- ThumbRate -->
804
805
<SolidColorBrush x : Key =" ThumbRateForeground" Color =" {StaticResource SystemAccentColorDark1}" />
Original file line number Diff line number Diff line change 14
14
<Setter .Value>
15
15
<ControlTemplate TargetType =" {x:Type Thumb}" >
16
16
<Border
17
+ x : Name =" Border"
17
18
Background =" {TemplateBinding Background}"
18
19
BorderBrush =" {TemplateBinding BorderBrush}"
19
20
BorderThickness =" {TemplateBinding BorderThickness}"
20
21
CornerRadius =" {TemplateBinding Border.CornerRadius}" />
22
+ <ControlTemplate .Triggers>
23
+ <Trigger Property =" IsEnabled" Value =" False" >
24
+ <Setter TargetName =" Border" Property =" Background" Value =" {DynamicResource ThumbBackgroundDisabled}" />
25
+ </Trigger >
26
+ </ControlTemplate .Triggers>
21
27
</ControlTemplate >
22
28
</Setter .Value>
23
29
</Setter >
Original file line number Diff line number Diff line change 746
746
<SolidColorBrush x : Key =" TextControlPlaceholderForeground" Color =" {StaticResource TextFillColorSecondary}" />
747
747
<!-- Thumb -->
748
748
<SolidColorBrush x : Key =" ThumbBackground" Color =" {StaticResource ControlStrongFillColorDefault}" />
749
+ <SolidColorBrush x : Key =" ThumbBackgroundDisabled" Color =" {StaticResource ControlStrongFillColorDisabled}" />
749
750
<!-- ThumbRate -->
750
751
<SolidColorBrush x : Key =" ThumbRateForeground" Color =" {StaticResource SystemAccentColorLight3}" />
751
752
<!-- TimePicker -->
4980
4981
<Setter Property =" Template" >
4981
4982
<Setter .Value>
4982
4983
<ControlTemplate TargetType =" {x:Type Thumb}" >
4983
- <Border Background =" {TemplateBinding Background}" BorderBrush =" {TemplateBinding BorderBrush}" BorderThickness =" {TemplateBinding BorderThickness}" CornerRadius =" {TemplateBinding Border.CornerRadius}" />
4984
+ <Border x : Name =" Border" Background =" {TemplateBinding Background}" BorderBrush =" {TemplateBinding BorderBrush}" BorderThickness =" {TemplateBinding BorderThickness}" CornerRadius =" {TemplateBinding Border.CornerRadius}" />
4985
+ <ControlTemplate .Triggers>
4986
+ <Trigger Property =" IsEnabled" Value =" False" >
4987
+ <Setter TargetName =" Border" Property =" Background" Value =" {DynamicResource ThumbBackgroundDisabled}" />
4988
+ </Trigger >
4989
+ </ControlTemplate .Triggers>
4984
4990
</ControlTemplate >
4985
4991
</Setter .Value>
4986
4992
</Setter >
Original file line number Diff line number Diff line change 576
576
<SolidColorBrush x : Key =" TextControlPlaceholderForeground" Color =" {StaticResource SystemColorGrayTextColor}" />
577
577
<!-- Thumb -->
578
578
<SolidColorBrush x : Key =" ThumbBackground" Color =" {StaticResource SystemColorButtonTextColor}" />
579
+ <SolidColorBrush x : Key =" ThumbBackgroundDisabled" Color =" {StaticResource SystemColorButtonFaceColor}" />
579
580
<!-- ThumbRate -->
580
581
<SolidColorBrush x : Key =" ThumbRateForeground" Color =" {StaticResource SystemColorHighlightColor}" />
581
582
<!-- TimePicker -->
4893
4894
<Setter Property =" Template" >
4894
4895
<Setter .Value>
4895
4896
<ControlTemplate TargetType =" {x:Type Thumb}" >
4896
- <Border Background =" {TemplateBinding Background}" BorderBrush =" {TemplateBinding BorderBrush}" BorderThickness =" {TemplateBinding BorderThickness}" CornerRadius =" {TemplateBinding Border.CornerRadius}" />
4897
+ <Border x : Name =" Border" Background =" {TemplateBinding Background}" BorderBrush =" {TemplateBinding BorderBrush}" BorderThickness =" {TemplateBinding BorderThickness}" CornerRadius =" {TemplateBinding Border.CornerRadius}" />
4898
+ <ControlTemplate .Triggers>
4899
+ <Trigger Property =" IsEnabled" Value =" False" >
4900
+ <Setter TargetName =" Border" Property =" Background" Value =" {DynamicResource ThumbBackgroundDisabled}" />
4901
+ </Trigger >
4902
+ </ControlTemplate .Triggers>
4897
4903
</ControlTemplate >
4898
4904
</Setter .Value>
4899
4905
</Setter >
Original file line number Diff line number Diff line change 755
755
<SolidColorBrush x : Key =" TextControlPlaceholderForeground" Color =" {StaticResource TextFillColorSecondary}" />
756
756
<!-- Thumb -->
757
757
<SolidColorBrush x : Key =" ThumbBackground" Color =" {StaticResource ControlStrongFillColorDefault}" />
758
+ <SolidColorBrush x : Key =" ThumbBackgroundDisabled" Color =" {StaticResource ControlStrongFillColorDisabled}" />
758
759
<!-- ThumbRate -->
759
760
<SolidColorBrush x : Key =" ThumbRateForeground" Color =" {StaticResource SystemAccentColorDark1}" />
760
761
<!-- TimePicker -->
4989
4990
<Setter Property =" Template" >
4990
4991
<Setter .Value>
4991
4992
<ControlTemplate TargetType =" {x:Type Thumb}" >
4992
- <Border Background =" {TemplateBinding Background}" BorderBrush =" {TemplateBinding BorderBrush}" BorderThickness =" {TemplateBinding BorderThickness}" CornerRadius =" {TemplateBinding Border.CornerRadius}" />
4993
+ <Border x : Name =" Border" Background =" {TemplateBinding Background}" BorderBrush =" {TemplateBinding BorderBrush}" BorderThickness =" {TemplateBinding BorderThickness}" CornerRadius =" {TemplateBinding Border.CornerRadius}" />
4994
+ <ControlTemplate .Triggers>
4995
+ <Trigger Property =" IsEnabled" Value =" False" >
4996
+ <Setter TargetName =" Border" Property =" Background" Value =" {DynamicResource ThumbBackgroundDisabled}" />
4997
+ </Trigger >
4998
+ </ControlTemplate .Triggers>
4993
4999
</ControlTemplate >
4994
5000
</Setter .Value>
4995
5001
</Setter >
You can’t perform that action at this time.
0 commit comments