From 77e1adeaf8e6d4d5b8b04d0b84b442ce141b88f2 Mon Sep 17 00:00:00 2001
From: LynxTWO <usaf.the.boyd@gmail.com>
Date: Sun, 23 Aug 2026 22:51:50 -0400
Subject: [PATCH] Give the bank keys and the rail keys the same housing lamp

The keys got light instead of an outline; the bank positions and the
navigation rail still had the outline. Two of the three surfaces you
click responding one way and the third responding another is worse than
either choice on its own.

Bank keys get a tighter, dimmer version of the same fixture - they sit
2 DIP apart, and a button-sized bloom on each would wash across its
neighbours. It deliberately does not light the SELECTED position: the
teal pip says which one is engaged and the warm lamp says which one you
are on, and running both off the same key would collapse two different
questions into one glow.

The rail keys draw themselves in code rather than from a template, so
the lamp is built there and composed over whatever shadow the active
state already chose. An active key keeps its teal halo and gains the
warm one, the way a lit key still lights its own seam. D-080 (4) put
the rail in scope for exactly this reason: it is the most-clicked
surface in the app and it should not be the one thing that stops
responding.

Not doing here: the rail keys still do not DEFORM. That needs
RailStripKey to grow a layered template, which is a bigger change than
this one, and the light is the part that makes the console feel like
one object.
---
 src/CUETools.Linux.App/Controls/RailStrip.cs  | 49 ++++++++++++
 .../Theme/AnalogControls.axaml                | 79 ++++++++++++++-----
 tests/CUETools.Linux.Tests/SeamLightTests.cs  | 24 ++++++
 3 files changed, 131 insertions(+), 21 deletions(-)

diff --git a/src/CUETools.Linux.App/Controls/RailStrip.cs b/src/CUETools.Linux.App/Controls/RailStrip.cs
index 39a36bc..05ea17e 100644
--- a/src/CUETools.Linux.App/Controls/RailStrip.cs
+++ b/src/CUETools.Linux.App/Controls/RailStrip.cs
@@ -68,6 +68,14 @@ public RailStripKey(Geometry glyph, string pageName)
 
     public bool IsActiveKey { get; private set; }
 
+    /// <summary>Pointer state for the housing lamp (D-088). These keys draw
+    /// themselves rather than living in a template, so the seam light that the
+    /// key styles get from XAML has to be built here instead. D-080 (4) put the
+    /// rail in scope precisely so the most-clicked surface in the app would not
+    /// be the one thing that stopped responding.</summary>
+    private bool _hot;
+    private bool _held;
+
     public void SetActive(bool active)
     {
         IsActiveKey = active;
@@ -104,5 +112,46 @@ public void Restyle()
             _glyph.Effect = null;
             BoxShadow = BoxShadows.Parse(dark ? "0 1.5 3 0 #70000000" : "0 1.5 3 0 #30536057");
         }
+
+        // the housing lamp under the key, over whatever shadow the state above
+        // chose. An active key keeps its teal halo and gains the warm one, the
+        // same way a lit key on a console still lights its own seam.
+        if (_hot || _held)
+        {
+            string seam = this.TryFindResource("KeySeamColor", ActualThemeVariant, out object? c) && c is Color sc
+                ? $"{sc.R:X2}{sc.G:X2}{sc.B:X2}"
+                : (dark ? "F0A24A" : "C9762A");
+            string alpha = _held ? "B0" : "55";
+            BoxShadow = BoxShadows.Parse($"{BoxShadow}, 0 1 13 0 #{alpha}{seam}");
+        }
+    }
+
+    protected override void OnPointerEntered(Avalonia.Input.PointerEventArgs e)
+    {
+        base.OnPointerEntered(e);
+        _hot = true;
+        Restyle();
+    }
+
+    protected override void OnPointerExited(Avalonia.Input.PointerEventArgs e)
+    {
+        base.OnPointerExited(e);
+        _hot = false;
+        _held = false;
+        Restyle();
+    }
+
+    protected override void OnPointerPressed(Avalonia.Input.PointerPressedEventArgs e)
+    {
+        base.OnPointerPressed(e);
+        _held = true;
+        Restyle();
+    }
+
+    protected override void OnPointerReleased(Avalonia.Input.PointerReleasedEventArgs e)
+    {
+        base.OnPointerReleased(e);
+        _held = false;
+        Restyle();
     }
 }
diff --git a/src/CUETools.Linux.App/Theme/AnalogControls.axaml b/src/CUETools.Linux.App/Theme/AnalogControls.axaml
index aeb6d90..4b3049c 100644
--- a/src/CUETools.Linux.App/Theme/AnalogControls.axaml
+++ b/src/CUETools.Linux.App/Theme/AnalogControls.axaml
@@ -355,25 +355,48 @@
     <Setter Property="Margin" Value="0,1,2,1" />
     <Setter Property="Template">
       <ControlTemplate>
-        <Border Name="bankKey"
-                Background="Transparent"
-                BorderBrush="Transparent"
-                BorderThickness="1"
-                CornerRadius="5"
-                Padding="{TemplateBinding Padding}">
-          <StackPanel Spacing="3">
-            <ContentPresenter Name="bankKeyContent"
-                              Content="{TemplateBinding Content}"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              HorizontalAlignment="Center" />
-            <!-- the detent pip: the lamp that says which position is engaged -->
-            <Border Name="bankPip"
-                    Height="3" Width="20" CornerRadius="1.5"
-                    HorizontalAlignment="Center"
-                    Opacity="0.55"
-                    Background="{DynamicResource Line}" />
-          </StackPanel>
-        </Border>
+        <Panel ClipToBounds="False">
+          <!-- D-088, same fixture as a full key: the housing lamp under this
+               position, seen through its seam. Tighter and dimmer than a
+               button's, because bank keys sit 2 DIP apart and a button-sized
+               bloom on each would wash across its neighbours.
+               It deliberately does NOT light the selected position. The teal
+               pip says which one is engaged and the amber says which one you
+               are touching; running both off the same key would collapse two
+               different questions into one light. -->
+          <Border Name="bankSeam" Opacity="0" IsHitTestVisible="False"
+                  ClipToBounds="False" CornerRadius="5">
+            <Border.Background>
+              <LinearGradientBrush StartPoint="0%,0%" EndPoint="0%,100%">
+                <GradientStop Color="{DynamicResource KeySeamColor}" Offset="0" />
+                <GradientStop Color="{DynamicResource KeySeamColor}" Offset="1" />
+              </LinearGradientBrush>
+            </Border.Background>
+            <Border.Effect>
+              <DropShadowEffect OffsetX="0" OffsetY="1" BlurRadius="12" Opacity="0.9"
+                                Color="{DynamicResource KeySeamColor}" />
+            </Border.Effect>
+          </Border>
+          <Border Name="bankKey"
+                  Background="Transparent"
+                  BorderBrush="Transparent"
+                  BorderThickness="1"
+                  CornerRadius="5"
+                  Padding="{TemplateBinding Padding}">
+            <StackPanel Spacing="3">
+              <ContentPresenter Name="bankKeyContent"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                HorizontalAlignment="Center" />
+              <!-- the detent pip: the lamp that says which position is engaged -->
+              <Border Name="bankPip"
+                      Height="3" Width="20" CornerRadius="1.5"
+                      HorizontalAlignment="Center"
+                      Opacity="0.55"
+                      Background="{DynamicResource Line}" />
+            </StackPanel>
+          </Border>
+        </Panel>
       </ControlTemplate>
     </Setter>
   </Style>
@@ -388,8 +411,22 @@
     <Setter Property="FontSize" Value="11.5" />
   </Style>
 
-  <Style Selector="ListBox.bank ListBoxItem:pointerover /template/ Border#bankKey">
-    <Setter Property="BorderBrush" Value="{DynamicResource Line}" />
+  <!-- light, not an outline: the same replacement D-088 made on the keys -->
+  <Style Selector="ListBox.bank ListBoxItem /template/ Border#bankSeam">
+    <Setter Property="Transitions">
+      <Transitions>
+        <DoubleTransition Property="Opacity" Duration="0:0:0.16" Easing="CubicEaseOut" />
+      </Transitions>
+    </Setter>
+  </Style>
+  <Style Selector="ListBox.bank ListBoxItem:pointerover /template/ Border#bankSeam">
+    <Setter Property="Opacity" Value="0.26" />
+  </Style>
+  <Style Selector="ListBox.bank ListBoxItem:pressed /template/ Border#bankSeam">
+    <Setter Property="Opacity" Value="0.7" />
+  </Style>
+  <Style Selector="ListBox.bank:disabled ListBoxItem /template/ Border#bankSeam">
+    <Setter Property="Opacity" Value="0" />
   </Style>
   <Style Selector="ListBox.bank ListBoxItem:pressed /template/ Border#bankKey">
     <Setter Property="Background" Value="{DynamicResource ButtonPressed}" />
diff --git a/tests/CUETools.Linux.Tests/SeamLightTests.cs b/tests/CUETools.Linux.Tests/SeamLightTests.cs
index 5caa9af..120f771 100644
--- a/tests/CUETools.Linux.Tests/SeamLightTests.cs
+++ b/tests/CUETools.Linux.Tests/SeamLightTests.cs
@@ -59,6 +59,30 @@ public void HoverNoLongerDrawsAnOutlineOnTheKeyFace()
             Theme());
     }
 
+    [Fact]
+    public void NoBankPositionOutlinesItselfOnHoverEither()
+    {
+        // the bank keys had the same outline, for the same reason, and it would
+        // have been easy to fix one surface and leave the other
+        Assert.DoesNotMatch(
+            new Regex(@"ListBoxItem:pointerover\s*/template/\s*Border#bankKey"),
+            Theme());
+        Assert.Matches(
+            new Regex(@"ListBoxItem:pointerover\s*/template/\s*Border#bankSeam"),
+            Theme());
+    }
+
+    [Fact]
+    public void TheBankLampNeverAnswersTheQuestionThePipAlreadyAnswers()
+    {
+        // two lights, two questions: the teal pip says which position is
+        // engaged, the warm lamp says which one the pointer is on. Lighting the
+        // seam of the SELECTED key would collapse them into one ambiguous glow.
+        Assert.DoesNotMatch(
+            new Regex(@"ListBoxItem:selected\s*/template/\s*Border#bankSeam"),
+            Theme());
+    }
+
     [AvaloniaFact]
     public void TheHousingLampIsWarmAndNotMistakableForTheAccent()
     {