From 80da2514b476f0f3c6bc1d971681c80857b6a0ca Mon Sep 17 00:00:00 2001
From: Christoph Wille <christoph.wille@gmail.com>
Date: Mon, 5 Oct 2026 10:54:37 +0200
Subject: [PATCH 1/2] Give the scrollbar thumb a grey that shows against its
 track

The Simple theme takes a scrollbar's thumb and track from two neighbouring
palette brushes. The quiet palette App.axaml restates leaves those a shade
apart in Light (#F0F2F5 on #F6F7F9), and the pressed thumb lighter than the
track, so a list that scrolls did not show it. Dark was weak the same way.

Retuning the palette brushes was rejected: buttons, combo boxes and list
hover states share them. The thumb gets a translucent mid-grey of its own
instead, which needs no per-theme resource and reads on both tracks.

Assisted-by: Claude:claude-fable-5-1:Claude Code
---
 src/Stampeded/App.axaml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/Stampeded/App.axaml b/src/Stampeded/App.axaml
index 4bc3e85..31dfa88 100644
--- a/src/Stampeded/App.axaml
+++ b/src/Stampeded/App.axaml
@@ -214,6 +214,19 @@
     <Style Selector="MenuItem">
       <Setter Property="ToolTip.ShowOnDisabled" Value="True" />
     </Style>
+    <!-- A scrollbar's thumb in a grey of its own. The Simple theme takes thumb and track from
+         two neighbouring palette brushes, which the quiet palette above leaves a shade apart -
+         and its pressed thumb is lighter than the track - so a list did not show that it
+         scrolls. Translucent, so the one grey stands out on the light track and the dark. -->
+    <Style Selector="ScrollBar /template/ Thumb#thumb">
+      <Setter Property="Background" Value="#70808080" />
+    </Style>
+    <Style Selector="ScrollBar /template/ Thumb#thumb:pointerover">
+      <Setter Property="Background" Value="#A0808080" />
+    </Style>
+    <Style Selector="ScrollBar /template/ Thumb#thumb:pressed">
+      <Setter Property="Background" Value="#C8808080" />
+    </Style>
     <Style Selector="OverlayPopupHost">
       <Setter Property="RenderTransformOrigin" Value="0%,0%" />
       <Setter Property="RenderTransform" Value="{x:Static local:ZoomState.PopupScale}" />

From e9e2d635009eaa1365f6ef5b0ac44ebfb8ce6754 Mon Sep 17 00:00:00 2001
From: Christoph Wille <christoph.wille@gmail.com>
Date: Mon, 5 Oct 2026 10:54:38 +0200
Subject: [PATCH 2/2] Keep icons and captured text intact across a theme switch

Two things went missing after switching theme, for unrelated reasons.

Going Dark and back to Light left the monochrome toolbar icons light grey on
a light background. The dark stylesheet was cleared by setting Css to null,
but an SvgImage without a stylesheet falls back to the one its source was
last loaded with - the dark one. Light now sets an explicit stylesheet that
restates the icons' own colour.

A screenshot request that switched the theme showed every text block built
from Runs as blank, and left it blank afterwards. The watcher rendered the
window in the same tick as the command, before the layout pass; Avalonia
draws such a text block as empty in that state and its run cache keeps the
empty result. The capture caused what it showed - a switch from the menu
never did this. The watcher now runs the layout pass before it renders.

Assisted-by: Claude:claude-fable-5-1:Claude Code
---
 src/Stampeded/Images.cs            | 11 +++++++++--
 src/Stampeded/ScreenshotWatcher.cs |  5 +++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/Stampeded/Images.cs b/src/Stampeded/Images.cs
index 4b02b4b..d7aa082 100644
--- a/src/Stampeded/Images.cs
+++ b/src/Stampeded/Images.cs
@@ -34,13 +34,20 @@ public static class Images
 	// every icon one that lifts that single colour and leaves the coloured parts alone.
 	const string DarkCss = "[fill=\"#202020\"] { fill: #D4D4D4; } [stroke=\"#202020\"] { stroke: #D4D4D4; }";
 
+	// The same rule restating the colour the icons already have. Not null: an SvgImage whose
+	// stylesheet is cleared falls back to the one its source was last loaded with, so an icon
+	// that has been dark once would stay light-on-light.
+	const string LightCss = "[fill=\"#202020\"] { fill: #202020; } [stroke=\"#202020\"] { stroke: #202020; }";
+
+	static string ThemeCss => Themes.ThemeManager.Current.IsDarkTheme ? DarkCss : LightCss;
+
 	static readonly List<SvgImage> loaded = [];
 
 	static Images()
 	{
 		Themes.ThemeManager.Current.ThemeChanged += (_, _) => {
 			foreach (var image in loaded)
-				image.Css = Themes.ThemeManager.Current.IsDarkTheme ? DarkCss : null;
+				image.Css = ThemeCss;
 		};
 	}
 
@@ -48,7 +55,7 @@ static IImage LoadSvg(string name)
 	{
 		var image = new SvgImage {
 			Source = SvgSource.Load(AssetBase + name + ".svg", null),
-			Css = Themes.ThemeManager.Current.IsDarkTheme ? DarkCss : null,
+			Css = ThemeCss,
 		};
 		loaded.Add(image);
 		return image;
diff --git a/src/Stampeded/ScreenshotWatcher.cs b/src/Stampeded/ScreenshotWatcher.cs
index b012af1..2ed717d 100644
--- a/src/Stampeded/ScreenshotWatcher.cs
+++ b/src/Stampeded/ScreenshotWatcher.cs
@@ -480,6 +480,11 @@ public static void Attach(Window mainWindow)
 						App.Workspace?.NavigateToFileLineAsync(parts[1], gotoLine, oldSide: false, record: false).HandleExceptions();
 				}
 				var size = new Avalonia.PixelSize((int)window.Bounds.Width, (int)window.Bounds.Height);
+				// A command above may have invalidated layout in this same tick - a theme switch
+				// does, for every text block. Rendering before the layout pass draws a text block
+				// built from inlines as empty, and its run cache then keeps the empty result for
+				// good: the capture would not just show the blank rows, it would cause them.
+				window.UpdateLayout();
 				using var bitmap = new RenderTargetBitmap(size, new Avalonia.Vector(96, 96));
 				bitmap.Render(window);
 #pragma warning disable CS0618 // default PNG encoding is all this debug utility needs