File tree 5 files changed +6
-2
lines changed
src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent
5 files changed +6
-2
lines changed Original file line number Diff line number Diff line change 183
183
<!-- Button -->
184
184
<SolidColorBrush x : Key =" AccentButtonBackground" Color =" {StaticResource SystemColorHighlightColor}" />
185
185
<SolidColorBrush x : Key =" AccentButtonBackgroundPointerOver" Color =" {StaticResource SystemColorButtonTextColor}" />
186
- <SolidColorBrush x : Key =" AccentButtonBackgroundPressed" Color =" {StaticResource SystemColorHighlightColor }" />
186
+ <SolidColorBrush x : Key =" AccentButtonBackgroundPressed" Color =" {StaticResource SystemColorButtonFaceColor }" />
187
187
<SolidColorBrush x : Key =" AccentButtonBackgroundDisabled" Color =" {StaticResource SystemColorButtonFaceColor}" />
188
188
<SolidColorBrush x : Key =" AccentButtonForeground" Color =" {StaticResource SystemColorHighlightTextColor}" />
189
189
<SolidColorBrush x : Key =" AccentButtonForegroundPointerOver" Color =" {StaticResource SystemColorButtonFaceColor}" />
Original file line number Diff line number Diff line change 116
116
<Trigger Property =" IsMouseOver" Value =" True" >
117
117
<Setter TargetName =" ContentBorder" Property =" Background" Value =" {DynamicResource AccentButtonBackgroundPointerOver}" />
118
118
<Setter TargetName =" ContentBorder" Property =" BorderBrush" Value =" {DynamicResource AccentButtonBorderBrushPointerOver}" />
119
+ <Setter TargetName =" ContentPresenter" Property =" TextElement.Foreground" Value =" {DynamicResource AccentButtonForegroundPointerOver}" />
119
120
</Trigger >
120
121
<Trigger Property =" IsPressed" Value =" True" >
121
122
<Setter TargetName =" ContentBorder" Property =" Background" Value =" {DynamicResource AccentButtonBackgroundPressed}" />
Original file line number Diff line number Diff line change 834
834
<Trigger Property =" IsMouseOver" Value =" True" >
835
835
<Setter TargetName =" ContentBorder" Property =" Background" Value =" {DynamicResource AccentButtonBackgroundPointerOver}" />
836
836
<Setter TargetName =" ContentBorder" Property =" BorderBrush" Value =" {DynamicResource AccentButtonBorderBrushPointerOver}" />
837
+ <Setter TargetName =" ContentPresenter" Property =" TextElement.Foreground" Value =" {DynamicResource AccentButtonForegroundPointerOver}" />
837
838
</Trigger >
838
839
<Trigger Property =" IsPressed" Value =" True" >
839
840
<Setter TargetName =" ContentBorder" Property =" Background" Value =" {DynamicResource AccentButtonBackgroundPressed}" />
Original file line number Diff line number Diff line change 217
217
<!-- Button -->
218
218
<SolidColorBrush x : Key =" AccentButtonBackground" Color =" {StaticResource SystemColorHighlightColor}" />
219
219
<SolidColorBrush x : Key =" AccentButtonBackgroundPointerOver" Color =" {StaticResource SystemColorButtonTextColor}" />
220
- <SolidColorBrush x : Key =" AccentButtonBackgroundPressed" Color =" {StaticResource SystemColorHighlightColor }" />
220
+ <SolidColorBrush x : Key =" AccentButtonBackgroundPressed" Color =" {StaticResource SystemColorButtonFaceColor }" />
221
221
<SolidColorBrush x : Key =" AccentButtonBackgroundDisabled" Color =" {StaticResource SystemColorButtonFaceColor}" />
222
222
<SolidColorBrush x : Key =" AccentButtonForeground" Color =" {StaticResource SystemColorHighlightTextColor}" />
223
223
<SolidColorBrush x : Key =" AccentButtonForegroundPointerOver" Color =" {StaticResource SystemColorButtonFaceColor}" />
782
782
<Trigger Property =" IsMouseOver" Value =" True" >
783
783
<Setter TargetName =" ContentBorder" Property =" Background" Value =" {DynamicResource AccentButtonBackgroundPointerOver}" />
784
784
<Setter TargetName =" ContentBorder" Property =" BorderBrush" Value =" {DynamicResource AccentButtonBorderBrushPointerOver}" />
785
+ <Setter TargetName =" ContentPresenter" Property =" TextElement.Foreground" Value =" {DynamicResource AccentButtonForegroundPointerOver}" />
785
786
</Trigger >
786
787
<Trigger Property =" IsPressed" Value =" True" >
787
788
<Setter TargetName =" ContentBorder" Property =" Background" Value =" {DynamicResource AccentButtonBackgroundPressed}" />
Original file line number Diff line number Diff line change 843
843
<Trigger Property =" IsMouseOver" Value =" True" >
844
844
<Setter TargetName =" ContentBorder" Property =" Background" Value =" {DynamicResource AccentButtonBackgroundPointerOver}" />
845
845
<Setter TargetName =" ContentBorder" Property =" BorderBrush" Value =" {DynamicResource AccentButtonBorderBrushPointerOver}" />
846
+ <Setter TargetName =" ContentPresenter" Property =" TextElement.Foreground" Value =" {DynamicResource AccentButtonForegroundPointerOver}" />
846
847
</Trigger >
847
848
<Trigger Property =" IsPressed" Value =" True" >
848
849
<Setter TargetName =" ContentBorder" Property =" Background" Value =" {DynamicResource AccentButtonBackgroundPressed}" />
You can’t perform that action at this time.
0 commit comments