Wrong Resource Usage in Fluent2 Button Styles

[robert-abeo]

Description

The following line has the wrong resource. It's using a level 2 resource key ControlElevationBorderBrush but should be using the button-specific level 3 one.

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

Line 58 in 673c354

<Setter TargetName="ContentBorder" Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />

Looks like the accent button styles are incorrect in a similar way. In fact the resource keys we should be using are commented out. I suspect elevation brush needs to be fixed overall.

Reproduction Steps

See code.

Expected behavior

We should be using the proper resource key:

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

Line 341 in 673c354

<!--<SolidColorBrush x:Key="ButtonBorderBrushPointerOver" Color="{StaticResource ControlElevationBorder}" />-->

Which for some reason is commented out. All these resources need to be re-actived and used in the templates. This includes the accent button ones:

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

Lines 327 to 329 in 673c354

	<!--<SolidColorBrush x:Key="AccentButtonForegroundDisabled" ResourceKey="TextOnAccentFillColorDisabled" />-->
	<!--<SolidColorBrush x:Key="AccentButtonBorderBrush" Color="{DynamicResource AccentControlElevationBorder}" />-->
	<!--<SolidColorBrush x:Key="AccentButtonBorderBrushPointerOver" Color="{DynamicResource AccentControlElevationBorder}" />-->

Actual behavior

As described above.

Regression?

No response

Known Workarounds

No response

Impact

No response

Configuration

No response

Other information

No response

[dipeshmsft]

With the merge of #10578, the above issue is fixed. Hence closing this now.