Skip to content

Code Quality: Fixed HighContrast theme resources #17409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Code Quality: Fixed HighContrast theme resources #17409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02fcefa
Init
0x5bfa Aug 7, 2025
aee8e6e
Update
0x5bfa Aug 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 18 additions & 12 deletions src/Files.App.Controls/BreadcrumbBar/BreadcrumbBar.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,21 @@
xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
xmlns:local="using:Files.App.Controls">

<ResourceDictionary.ThemeDictionaries>
<ResourceDictionary x:Key="Default">
<StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overriding WinUI brushes across an entire XAML file introduces potential risks and unintended side effects. It would be safer to stick with our previous approach using lightweight styling and apply a custom brush if needed.

<StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
</ResourceDictionary>
<ResourceDictionary x:Key="Light">
<StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
<StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
</ResourceDictionary>
<ResourceDictionary x:Key="HighContrast">
<StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="SystemColorHighlightTextColorBrush" />
<StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="SystemColorHighlightTextColorBrush" />
</ResourceDictionary>
</ResourceDictionary.ThemeDictionaries>

<x:Double x:Key="BreadcrumbBarHeight">34</x:Double>
<x:Double x:Key="BreadcrumbBarMinWidth">120</x:Double>
<x:Double x:Key="BreadcrumbBarEllipsisFontSize">16</x:Double>
Expand Down Expand Up @@ -131,10 +146,6 @@
CornerRadius="{TemplateBinding CornerRadius}"
ToolTipService.ToolTip="{TemplateBinding ItemToolTip}"
UseSystemFocusVisuals="True">
<Button.Resources>
<SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{ThemeResource SubtleFillColorSecondary}" />
<SolidColorBrush x:Key="ButtonBackgroundPressed" Color="{ThemeResource SubtleFillColorTertiary}" />
</Button.Resources>

<FlyoutBase.AttachedFlyout>
<MenuFlyout
Expand Down Expand Up @@ -180,13 +191,8 @@
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{StaticResource BreadcrumbBarChevronCornerRaduis}"
Style="{StaticResource BreadcrumbBarItemChevronButtonStyle}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to assign the style?

ToolTipService.ToolTip="{TemplateBinding ChevronToolTip}"
UseSystemFocusVisuals="True">
<Button.Resources>
<SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{ThemeResource SubtleFillColorSecondary}" />
<SolidColorBrush x:Key="ButtonBackgroundPressed" Color="{ThemeResource SubtleFillColorTertiary}" />
</Button.Resources>

<FlyoutBase.AttachedFlyout>
<MenuFlyout
Expand Down Expand Up @@ -273,7 +279,7 @@
</Style>

<Style
x:Key="BreadcrumbBarItemChevronButtonStyle"
x:Key="BreadcrumbBarButtonStyle"
BasedOn="{StaticResource DefaultButtonStyle}"
TargetType="Button">
<Setter Property="Template">
Expand Down Expand Up @@ -303,7 +309,7 @@
<VisualState x:Name="PointerOver">
<Storyboard>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonBackgroundPointerOver}" />
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource BreadcrumbBarButtonBackgroundPointerOver}" />
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonBorderBrushPointerOver}" />
Expand All @@ -316,7 +322,7 @@
<VisualState x:Name="Pressed">
<Storyboard>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonBackgroundPressed}" />
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource BreadcrumbBarButtonBackgroundPressed}" />
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonBorderBrushPressed}" />
Expand Down
31 changes: 20 additions & 11 deletions src/Files.App.Controls/Omnibar/Omnibar.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,24 @@
xmlns:local="using:Files.App.Controls"
xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives">

<ResourceDictionary.ThemeDictionaries>
<ResourceDictionary x:Key="Default">
<StaticResource x:Key="OmnibarTextBoxFocusedBorderBrush" ResourceKey="AccentFillColorDefaultBrush" />
<StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
<StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
</ResourceDictionary>
<ResourceDictionary x:Key="Light">
<StaticResource x:Key="OmnibarTextBoxFocusedBorderBrush" ResourceKey="AccentFillColorDefaultBrush" />
<StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
<StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
</ResourceDictionary>
<ResourceDictionary x:Key="HighContrast">
<StaticResource x:Key="OmnibarTextBoxFocusedBorderBrush" ResourceKey="SystemAccentColorLight2" />
<StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="SystemColorHighlightTextColorBrush" />
<StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="SystemColorHighlightTextColorBrush" />
</ResourceDictionary>
</ResourceDictionary.ThemeDictionaries>

<x:Double x:Key="OmnibarDefaultHeight">38</x:Double>
<x:Double x:Key="OmnibarModeDefaultHeight">34</x:Double>
<x:Double x:Key="OmnibarModeDefaultClickAreaWidth">46</x:Double>
Expand Down Expand Up @@ -138,10 +156,6 @@
BorderThickness="0"
CornerRadius="{TemplateBinding CornerRadius}"
ToolTipService.ToolTip="{Binding ModeName, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
<Button.Resources>
<SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{ThemeResource SubtleFillColorSecondary}" />
<SolidColorBrush x:Key="ButtonBackgroundPressed" Color="{ThemeResource SubtleFillColorTertiary}" />
</Button.Resources>

<Grid>
<ContentPresenter
Expand Down Expand Up @@ -368,12 +382,7 @@
FontSize="{StaticResource TextBoxIconFontSize}"
Foreground="{ThemeResource TextControlButtonForeground}"
IsTabStop="False"
Visibility="Collapsed">
<Button.Resources>
<SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{ThemeResource SubtleFillColorSecondary}" />
<SolidColorBrush x:Key="ButtonBackgroundPressed" Color="{ThemeResource SubtleFillColorTertiary}" />
</Button.Resources>
</Button>
Visibility="Collapsed" />
</Grid>

<!-- Description -->
Expand Down Expand Up @@ -411,7 +420,7 @@
<VisualState.Setters>
<Setter Target="PlaceholderTextContentPresenter.Foreground" Value="{Binding PlaceholderForeground, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={ThemeResource TextControlPlaceholderForegroundFocused}}" />
<Setter Target="BorderElement.Background" Value="{ThemeResource TextControlBackgroundFocused}" />
<Setter Target="BorderElement.BorderBrush" Value="{ThemeResource AccentFillColorDefaultBrush}" />
<Setter Target="BorderElement.BorderBrush" Value="{ThemeResource OmnibarTextBoxFocusedBorderBrush}" />
<Setter Target="BorderElement.BorderThickness" Value="{ThemeResource OmnibarBorderThicknessFocused}" />
<Setter Target="BorderElement.Margin" Value="{StaticResource OmnibarBorderMarginUnfocused}" />
<Setter Target="ContentElement.Foreground" Value="{ThemeResource TextControlForegroundFocused}" />
Expand Down
Loading