Skip to content

Fix hover, pressed, and highlight states in high contrast #149

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

Merged
danielchalmers merged 1 commit into from
Jul 11, 2026
Merged

Fix hover, pressed, and highlight states in high contrast #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions DesktopClock/Themes/DarkPalette.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
<SolidColorBrush x:Key="SeparatorBrush" Color="#3F3F3F" />
<SolidColorBrush x:Key="TextPrimaryBrush" Color="#FFFFFF" />
<SolidColorBrush x:Key="TextSecondaryBrush" Color="#A6A6A6" />
<!-- Foreground on a hover/highlight fill; matches primary text since the fill is only a subtle tint here. -->
<SolidColorBrush x:Key="OnHoverTextBrush" Color="#FFFFFF" />
<SolidColorBrush x:Key="HoverBrush" Color="#383838" />
<SolidColorBrush x:Key="PressedBrush" Color="#303030" />
<SolidColorBrush x:Key="ButtonBackgroundBrush" Color="#2E2E2E" />
Expand Down
17 changes: 16 additions & 1 deletion DesktopClock/Themes/FluentTheme.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,11 @@
</Trigger>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="border" Property="Background" Value="{DynamicResource HoverBrush}" />
<Setter Property="Foreground" Value="{DynamicResource OnHoverTextBrush}" />
</Trigger>
<Trigger Property="IsPressed" Value="True">
<Setter TargetName="border" Property="Background" Value="{DynamicResource PressedBrush}" />
<Setter Property="Foreground" Value="{DynamicResource OnHoverTextBrush}" />
</Trigger>
<Trigger Property="IsKeyboardFocused" Value="True">
<Setter TargetName="border" Property="BorderBrush" Value="{DynamicResource AccentBrush}" />
Expand Down Expand Up @@ -114,12 +116,15 @@
<Trigger Property="local:NavButton.IsActive" Value="True">
<Setter TargetName="ActivePill" Property="Visibility" Value="Visible" />
<Setter TargetName="border" Property="Background" Value="{DynamicResource HoverBrush}" />
<Setter Property="Foreground" Value="{DynamicResource OnHoverTextBrush}" />
</Trigger>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="border" Property="Background" Value="{DynamicResource HoverBrush}" />
<Setter Property="Foreground" Value="{DynamicResource OnHoverTextBrush}" />
</Trigger>
<Trigger Property="IsPressed" Value="True">
<Setter TargetName="border" Property="Background" Value="{DynamicResource PressedBrush}" />
<Setter Property="Foreground" Value="{DynamicResource OnHoverTextBrush}" />
</Trigger>
<Trigger Property="IsKeyboardFocused" Value="True">
<Setter TargetName="border" Property="BorderBrush" Value="{DynamicResource AccentBrush}" />
Expand Down Expand Up @@ -246,9 +251,11 @@
<ControlTemplate.Triggers>
<Trigger Property="IsHighlighted" Value="True">
<Setter TargetName="Border" Property="Background" Value="{DynamicResource HoverBrush}" />
<Setter Property="Foreground" Value="{DynamicResource OnHoverTextBrush}" />
</Trigger>
<Trigger Property="IsSelected" Value="True">
<Setter TargetName="Border" Property="Background" Value="{DynamicResource HoverBrush}" />
<Setter Property="Foreground" Value="{DynamicResource OnHoverTextBrush}" />
<Setter TargetName="SelectionPill" Property="Visibility" Value="Visible" />
</Trigger>
<Trigger Property="IsEnabled" Value="False">
Expand Down Expand Up @@ -300,7 +307,8 @@
ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" />

<!-- Chevron -->
<Path Data="M 0,0 L 4.5,4.5 L 9,0"
<Path x:Name="Chevron"
Data="M 0,0 L 4.5,4.5 L 9,0"
Stroke="{DynamicResource TextSecondaryBrush}"
StrokeThickness="1.5"
StrokeStartLineCap="Round"
Expand Down Expand Up @@ -346,9 +354,13 @@
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="Border" Property="Background" Value="{DynamicResource HoverBrush}" />
<Setter Property="Foreground" Value="{DynamicResource OnHoverTextBrush}" />
<Setter TargetName="Chevron" Property="Stroke" Value="{DynamicResource OnHoverTextBrush}" />
</Trigger>
<Trigger Property="IsDropDownOpen" Value="True">
<Setter TargetName="Border" Property="Background" Value="{DynamicResource PressedBrush}" />
<Setter Property="Foreground" Value="{DynamicResource OnHoverTextBrush}" />
<Setter TargetName="Chevron" Property="Stroke" Value="{DynamicResource OnHoverTextBrush}" />
</Trigger>
<Trigger Property="IsKeyboardFocusWithin" Value="True">
<Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource AccentBrush}" />
Expand Down Expand Up @@ -767,6 +779,9 @@
</Trigger>
<Trigger Property="IsHighlighted" Value="True">
<Setter TargetName="Border" Property="Background" Value="{DynamicResource HoverBrush}" />
<Setter Property="Foreground" Value="{DynamicResource OnHoverTextBrush}" />
<Setter TargetName="CheckMark" Property="Stroke" Value="{DynamicResource OnHoverTextBrush}" />
<Setter TargetName="GestureText" Property="Foreground" Value="{DynamicResource OnHoverTextBrush}" />
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Foreground" Value="{DynamicResource TextSecondaryBrush}" />
Expand Down
6 changes: 4 additions & 2 deletions DesktopClock/Themes/HighContrastPalette.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@
<SolidColorBrush x:Key="SeparatorBrush" Color="{DynamicResource {x:Static SystemColors.ActiveBorderColorKey}}" />
<SolidColorBrush x:Key="TextPrimaryBrush" Color="{DynamicResource {x:Static SystemColors.WindowTextColorKey}}" />
<SolidColorBrush x:Key="TextSecondaryBrush" Color="{DynamicResource {x:Static SystemColors.GrayTextColorKey}}" />
<SolidColorBrush x:Key="HoverBrush" Color="{DynamicResource {x:Static SystemColors.ControlColorKey}}" />
<SolidColorBrush x:Key="PressedBrush" Color="{DynamicResource {x:Static SystemColors.ControlColorKey}}" />
<SolidColorBrush x:Key="OnHoverTextBrush" Color="{DynamicResource {x:Static SystemColors.HighlightTextColorKey}}" />
<!-- Highlight, not Control: in every built-in high-contrast theme Control equals the window surface, so a Control-colored hover would be invisible. -->
<SolidColorBrush x:Key="HoverBrush" Color="{DynamicResource {x:Static SystemColors.HighlightColorKey}}" />
<SolidColorBrush x:Key="PressedBrush" Color="{DynamicResource {x:Static SystemColors.HighlightColorKey}}" />
<SolidColorBrush x:Key="ButtonBackgroundBrush" Color="{DynamicResource {x:Static SystemColors.ControlColorKey}}" />
<SolidColorBrush x:Key="ButtonBorderBrush" Color="{DynamicResource {x:Static SystemColors.ControlTextColorKey}}" />
<SolidColorBrush x:Key="ControlFillBrush" Color="{DynamicResource {x:Static SystemColors.WindowColorKey}}" />
Expand Down
2 changes: 2 additions & 0 deletions DesktopClock/Themes/LightPalette.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
<SolidColorBrush x:Key="SeparatorBrush" Color="#E5E5E5" />
<SolidColorBrush x:Key="TextPrimaryBrush" Color="#1A1A1A" />
<SolidColorBrush x:Key="TextSecondaryBrush" Color="#5D5D5D" />
<!-- Foreground on a hover/highlight fill; matches primary text since the fill is only a subtle tint here. -->
<SolidColorBrush x:Key="OnHoverTextBrush" Color="#1A1A1A" />
<SolidColorBrush x:Key="HoverBrush" Color="#EAEAEA" />
<SolidColorBrush x:Key="PressedBrush" Color="#E0E0E0" />
<SolidColorBrush x:Key="ButtonBackgroundBrush" Color="#FBFBFB" />
Expand Down