refactor(freeze-panes): cleanup pass + font-scaled flyout text + tall skinny layout

/simplify pass on the freeze-panes flyout: dropped a redundant _freezeFlyoutOpen
shadow field in favour of FlyoutBase.IsOpen, extracted a shared ClearFreezeGuide()
helper replacing four inlined copies of the same guide/cursor reset in
ViewportPanel, and bounded the placement-shading rect to the surface's actual
size instead of an oversized fixed-extent fill repainted every frame.

The flyout's caption and mode-button labels also now track UiFontScale (they
previously fell back to fixed 11px/10px regardless of the flyout's scaled root
FontSize), and the three mode buttons switched from a 3-column grid to a
vertical list with horizontal icon+label rows so they keep fitting at high UI
scale instead of getting squeezed.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

Author: sjvrensburg

src/RailReader2/Views/DocumentView.axaml.cs

@@ -631,7 +631,8 @@ private FreezePaneRenderState BuildFreezePaneState(TabViewModel? tab)
         return new FreezePaneRenderState(
             corner, top, left, cornerDst, topDst, leftDst,
             vm.Controller.ActiveColourEffect, vm.Controller.ActiveColourIntensity, vm.ColourEffects,
-            showGuide, guideH, guideV, guideX, guideY);
+            showGuide, guideH, guideV, guideX, guideY,
+            (float)Viewport.Bounds.Width, (float)Viewport.Bounds.Height);
 
         static SKRect Dst(BBox box, float zoom, float x, float y)
             => SKRect.Create(x, y, box.W * zoom, box.H * zoom);

src/RailReader2/Views/FreezePaneLayer.cs

@@ -18,11 +18,11 @@ internal sealed record FreezePaneRenderState(
     SKRect CornerDst, SKRect TopDst, SKRect LeftDst,
     ColourEffect Effect, float EffectIntensity, ColourEffectShaders? Effects,
     // Armed freeze-mode guide line(s) at the pointer (screen-space): a horizontal line (rows → freeze
-    // above), a vertical line (columns → freeze left), or both. Drawn full-length as accent guides so
-    // the user aims before clicking; a translucent tint covers the region that would be frozen (above
-    // the horizontal guide / left of the vertical guide) — the canvas is already clipped to this
-    // surface's bounds, so a full-length fill is enough without needing the surface size.
-    bool ShowGuide = false, bool GuideH = false, bool GuideV = false, float GuideX = 0, float GuideY = 0);
+    // above), a vertical line (columns → freeze left), or both, plus a translucent tint over the
+    // region that would be frozen (above the horizontal guide / left of the vertical guide).
+    // ViewW/ViewH (the surface size) bound the tint fill so it doesn't paint far past what's visible.
+    bool ShowGuide = false, bool GuideH = false, bool GuideV = false, float GuideX = 0, float GuideY = 0,
+    float ViewW = 0, float ViewH = 0);
 
 /// <summary>Hosts a CompositionCustomVisual that draws Excel-style frozen table panes (the rows above
 /// and columns left of the frozen cell) pinned over the live page while rail-reading a table.</summary>
@@ -103,29 +103,37 @@ public override void OnRender(ImmediateDrawingContext context)
         s_paint.ColorFilter = null;
 
         // Armed freeze-mode guide: full-length line(s) at the pointer, so the user aims the page-wide
-        // split before clicking. Drawn last, over everything, in an accent colour. A translucent tint
-        // is painted first over the region that WOULD be frozen (above/left of the guide) so the user
-        // sees exactly what a click commits, not just a bare line.
+        // split before clicking, each paired with a translucent tint over the region that WOULD be
+        // frozen (above/left of that guide) so the user sees exactly what a click commits, not just a
+        // bare line. Drawn last, over everything, in an accent colour. The tint is bounded to the
+        // surface's actual size (not an oversized fill) since it repaints every frame while armed.
         if (state.ShowGuide)
         {
-            const float far = 100000f;
+            const float far = 100000f; // guide lines still span off-screen; only the tint fill is bounded
+            float viewW = state.ViewW > 0 ? state.ViewW : far;
+            float viewH = state.ViewH > 0 ? state.ViewH : far;
             var shade = s_shadePaint ??= new SKPaint
             {
                 Color = new SKColor(0x29, 0x9D, 0xF5, 0x28), // accent blue, ~15% alpha
                 IsStroke = false,
             };
-            if (state.GuideH) canvas.DrawRect(SKRect.Create(-far, -far, 2 * far, far + state.GuideY), shade);
-            if (state.GuideV) canvas.DrawRect(SKRect.Create(-far, -far, far + state.GuideX, 2 * far), shade);
-
             var line = s_guidePaint ??= new SKPaint
             {
                 Color = new SKColor(0x29, 0x9D, 0xF5), // accent blue
                 IsStroke = true,
                 StrokeWidth = 2f,
                 IsAntialias = true,
             };
-            if (state.GuideH) canvas.DrawLine(-far, state.GuideY, far, state.GuideY, line); // freeze above
-            if (state.GuideV) canvas.DrawLine(state.GuideX, -far, state.GuideX, far, line); // freeze left
+            if (state.GuideH) // freeze above
+            {
+                canvas.DrawRect(SKRect.Create(0, 0, viewW, state.GuideY), shade);
+                canvas.DrawLine(-far, state.GuideY, far, state.GuideY, line);
+            }
+            if (state.GuideV) // freeze left
+            {
+                canvas.DrawRect(SKRect.Create(0, 0, state.GuideX, viewH), shade);
+                canvas.DrawLine(state.GuideX, -far, state.GuideX, far, line);
+            }
         }
     }
 }

src/RailReader2/Views/FreezePanesView.axaml

@@ -7,34 +7,35 @@
     <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
         <StackPanel Margin="8,6" Spacing="6" MinWidth="200">
             <TextBlock Text="Freeze panes" FontWeight="SemiBold" />
-            <TextBlock Text="Pin rows / columns in place while the rest of the page scrolls — works on any page."
-                       TextWrapping="Wrap" FontSize="11" Opacity="0.7" />
-            <UniformGrid Columns="3">
-                <ToggleButton Name="FreezeRowsButton" Margin="0,0,2,0"
-                              HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
+            <TextBlock Name="CaptionText"
+                       Text="Pin rows / columns in place while the rest of the page scrolls — works on any page."
+                       TextWrapping="Wrap" Opacity="0.7" />
+            <StackPanel Spacing="4">
+                <ToggleButton Name="FreezeRowsButton"
+                              HorizontalAlignment="Stretch" HorizontalContentAlignment="Left"
                               ToolTip.Tip="Then click in the page to freeze everything above a horizontal line.">
-                    <StackPanel Spacing="2" HorizontalAlignment="Center">
-                        <c:Icon Data="{StaticResource IconFreezeRows}" />
-                        <TextBlock Text="Rows" FontSize="10" HorizontalAlignment="Center" />
+                    <StackPanel Orientation="Horizontal" Spacing="8">
+                        <c:Icon Data="{StaticResource IconFreezeRows}" VerticalAlignment="Center" />
+                        <TextBlock Name="RowsLabel" Text="Rows" VerticalAlignment="Center" />
                     </StackPanel>
                 </ToggleButton>
-                <ToggleButton Name="FreezeColumnsButton" Margin="2,0"
-                              HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
+                <ToggleButton Name="FreezeColumnsButton"
+                              HorizontalAlignment="Stretch" HorizontalContentAlignment="Left"
                               ToolTip.Tip="Then click in the page to freeze everything left of a vertical line.">
-                    <StackPanel Spacing="2" HorizontalAlignment="Center">
-                        <c:Icon Data="{StaticResource IconFreezeColumns}" />
-                        <TextBlock Text="Columns" FontSize="10" HorizontalAlignment="Center" />
+                    <StackPanel Orientation="Horizontal" Spacing="8">
+                        <c:Icon Data="{StaticResource IconFreezeColumns}" VerticalAlignment="Center" />
+                        <TextBlock Name="ColumnsLabel" Text="Columns" VerticalAlignment="Center" />
                     </StackPanel>
                 </ToggleButton>
-                <ToggleButton Name="FreezeBothButton" Margin="2,0,0,0"
-                              HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
+                <ToggleButton Name="FreezeBothButton"
+                              HorizontalAlignment="Stretch" HorizontalContentAlignment="Left"
                               ToolTip.Tip="Then click to freeze above and left of a crossing point. Shortcut: Z">
-                    <StackPanel Spacing="2" HorizontalAlignment="Center">
-                        <c:Icon Data="{StaticResource IconFreezeBoth}" />
-                        <TextBlock Text="Both" FontSize="10" HorizontalAlignment="Center" />
+                    <StackPanel Orientation="Horizontal" Spacing="8">
+                        <c:Icon Data="{StaticResource IconFreezeBoth}" VerticalAlignment="Center" />
+                        <TextBlock Name="BothLabel" Text="Both" VerticalAlignment="Center" />
                     </StackPanel>
                 </ToggleButton>
-            </UniformGrid>
+            </StackPanel>
             <Button Name="UnfreezeButton" HorizontalAlignment="Stretch" Content="Unfreeze"
                     ToolTip.Tip="Clear this view's freeze." />
         </StackPanel>

src/RailReader2/Views/FreezePanesView.axaml.cs

@@ -1,4 +1,5 @@
 using System.ComponentModel;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using RailReader2.ViewModels;
@@ -29,6 +30,31 @@ public FreezePanesView()
         // Hosted in the toolbar's Freeze flyout, so this control is loaded/unloaded on every open/close.
         // (Re)wire to the VM on both DataContext change and load so re-opening the flyout stays live.
         DataContextChanged += (_, _) => Rewire();
+
+        RescaleText(); // seed from the default FontSize before ToolBarView pushes the scaled one
+    }
+
+    // ToolBarView sets our FontSize to the scaled UI font size (this flyout is a popup in its own
+    // visual root, so it doesn't inherit Window.FontSize / UiFontScale on its own — see
+    // ToolBarView.UpdateFreezeFontScale). The caption and mode labels are deliberately smaller than the
+    // header, so they can't just inherit FontSize outright — instead they're kept at the same ratio to
+    // it as the original fixed-px design (11px / 10px against a 14px base), so they scale in step.
+    private const double CaptionSizeRatio = 11.0 / 14.0;
+    private const double LabelSizeRatio = 10.0 / 14.0;
+
+    protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+    {
+        base.OnPropertyChanged(change);
+        if (change.Property == FontSizeProperty)
+            RescaleText();
+    }
+
+    private void RescaleText()
+    {
+        CaptionText.FontSize = FontSize * CaptionSizeRatio;
+        RowsLabel.FontSize = FontSize * LabelSizeRatio;
+        ColumnsLabel.FontSize = FontSize * LabelSizeRatio;
+        BothLabel.FontSize = FontSize * LabelSizeRatio;
     }
 
     protected override void OnLoaded(RoutedEventArgs e)

src/RailReader2/Views/ToolBarView.axaml.cs

@@ -19,7 +19,6 @@ public partial class ToolBarView : UserControl
     // to the same VM. Freeze is page-wide and table-independent, so the button is always available.
     private readonly Flyout _freezeFlyout = new();
     private readonly FreezePanesView _freezeView = new();
-    private bool _freezeFlyoutOpen;
 
     public MainWindowViewModel? ViewModel
     {
@@ -68,11 +67,9 @@ public ToolBarView()
         // with the toolbar's bottom-left edge, regardless of where the Freeze button sits in the row.
         // Button.Flyout would anchor to the button itself instead, so this is wired manually.
         _freezeFlyout.Placement = PlacementMode.BottomEdgeAlignedLeft;
-        _freezeFlyout.Opened += (_, _) => _freezeFlyoutOpen = true;
-        _freezeFlyout.Closed += (_, _) => _freezeFlyoutOpen = false;
         FreezeButton.Click += (_, _) =>
         {
-            if (_freezeFlyoutOpen) _freezeFlyout.Hide();
+            if (_freezeFlyout.IsOpen) _freezeFlyout.Hide();
             else _freezeFlyout.ShowAt(RootBorder);
         };
     }

src/RailReader2/Views/ViewportPanel.cs

@@ -113,12 +113,7 @@ protected override void OnPointerPressed(PointerPressedEventArgs e)
             if (vm.FreezeArmMode != FreezeMode.None)
             {
                 vm.FreezeArmMode = FreezeMode.None;
-                if (_freezeGuidePushed)
-                {
-                    OwnerView?.SetFreezeGuide(FreezeMode.None, 0, 0);
-                    Cursor = Cursor.Default;
-                    _freezeGuidePushed = false;
-                }
+                ClearFreezeGuide();
             }
             else if (vm.ActiveTool == AnnotationTool.TextSelect && vm.SelectedText is not null)
             {
@@ -199,12 +194,7 @@ protected override void OnPointerMoved(PointerEventArgs e)
                 _freezeGuidePushed = true;
                 return;
             }
-            if (_freezeGuidePushed)
-            {
-                OwnerView?.SetFreezeGuide(FreezeMode.None, 0, 0);
-                Cursor = Cursor.Default; // the link/annotation cursor logic re-applies on the next move
-                _freezeGuidePushed = false;
-            }
+            ClearFreezeGuide(); // the link/annotation cursor logic re-applies on the next move, below
 
             // Not dragging — update cursor for link hover (only in browse mode)
             if (!ViewModel.IsAnnotating)
@@ -266,19 +256,25 @@ protected override void OnPointerExited(PointerEventArgs e)
         // Pointer left this pane: drop its armed guide line so it doesn't stay painted here while the
         // pointer (and a fresh guide) moves onto a different split pane. The move handler re-pushes it on
         // re-entry. (OnPointerMoved only clears the guide once disarmed, never on a plain cross-pane exit.)
-        if (_freezeGuidePushed)
-        {
-            OwnerView?.SetFreezeGuide(FreezeMode.None, 0, 0);
-            Cursor = Cursor.Default;
-            _freezeGuidePushed = false;
-        }
+        ClearFreezeGuide();
     }
 
     private bool _showingLinkCursor;
     // True while this pane is pushing a freeze-mode guide line, so it can be cleared once disarmed.
     private bool _freezeGuidePushed;
     private static readonly Cursor s_crossCursor = new(StandardCursorType.Cross);
 
+    /// <summary>Drop this pane's armed freeze-mode guide line and restore the normal cursor. No-op
+    /// unless a guide is currently pushed. Shared by every place a freeze placement gets cancelled or
+    /// committed: pointer-move disarm, pointer-exit, right-click cancel, and commit-on-click.</summary>
+    private void ClearFreezeGuide()
+    {
+        if (!_freezeGuidePushed) return;
+        OwnerView?.SetFreezeGuide(FreezeMode.None, 0, 0);
+        Cursor = Cursor.Default;
+        _freezeGuidePushed = false;
+    }
+
     private void UpdateLinkCursor(bool overLink)
     {
         if (overLink == _showingLinkCursor) return;
@@ -319,12 +315,7 @@ protected override void OnPointerReleased(PointerReleasedEventArgs e)
             {
                 var (pageX, pageY) = ScreenToPage(pos);
                 ViewModel.PlaceFreeze(OwnerView?.SurfaceViewport, pageX, pageY);
-                OwnerView?.SetFreezeGuide(FreezeMode.None, 0, 0); // commit clears the guide
-                _freezeGuidePushed = false;
-                // Restore the normal cursor here: clearing _freezeGuidePushed disables OnPointerMoved's
-                // disarm reset, so without this the crosshair would stick. Link/annotation cursor logic
-                // re-applies on the next move.
-                Cursor = Cursor.Default;
+                ClearFreezeGuide(); // commit clears the guide; link/annotation cursor re-applies on the next move
             }
             // "Start rail here": when armed, a single click force-activates rail at the click point
             // (any zoom). Checked before markers/block-framing so it wins regardless of what's under it.