Keep the amber fill on focused accent buttons

Author: ClearanceClarence

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 What changed in each SpaceSharp release, newest first. The 1.x releases are in [CHANGELOG-1.x.md](CHANGELOG-1.x.md). A section marked unreleased is what the next version will say; the marker comes off when it ships, since the release script and the in-app What's new read the `## version` heading.
 
+## 2.2.1 (unreleased)
+
+### Fixes
+- The Map and Insights buttons went gray with a dark label after a click, because the new keyboard-focus look for toolbar buttons replaced their amber fill. The accent buttons keep the fill and show focus as a dark edge.
+
 ## 2.2.0
 
 ### Sixteen more languages

SpaceSharp/Themes/Styles.xaml

@@ -75,6 +75,12 @@
             <Trigger Property="IsMouseOver" Value="True">
                 <Setter Property="Background" Value="{DynamicResource AccentHover}" />
             </Trigger>
+            <!-- Overrides the base focus look, which would swap the amber fill for the gray hover tone and leave the
+                 dark label on it: the accent button keeps its fill and shows focus as a dark edge instead. -->
+            <Trigger Property="IsKeyboardFocused" Value="True">
+                <Setter Property="Background" Value="{DynamicResource AccentHover}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource AccentText}" />
+            </Trigger>
             <Trigger Property="IsPressed" Value="True">
                 <Setter Property="Background" Value="{DynamicResource AccentPressed}" />
             </Trigger>