From a48ed8ed7277f1fca43f291c02d89f2e1bc62b2b Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 6 Oct 2026 08:20:20 +0000 Subject: [PATCH] fix(app): captures render RTL windows as they are; the rail's check binds one way - As the Uploader and Setup captures now do: the content of a right-to-left window already renders mirrored, so no second flip. - The rail's buttons share a GroupName across its two lists; their check binds one way, so a window not yet on screen cannot write another's selection back into the shell. - The Arabic smoke test also checks that the rail is drawn on the right. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_012iLMBNwBE2GnphAsu4cjaC --- src/Titano.App/Shell/MainWindow.xaml | 7 ++++--- src/Titano.App/Shell/ScreenCapture.cs | 17 ++--------------- .../Windows/ScreenSmokeTests.cs | 4 +++- 3 files changed, 9 insertions(+), 19 deletions(-) diff --git a/src/Titano.App/Shell/MainWindow.xaml b/src/Titano.App/Shell/MainWindow.xaml index d0fc17d4..70b7a7e3 100644 --- a/src/Titano.App/Shell/MainWindow.xaml +++ b/src/Titano.App/Shell/MainWindow.xaml @@ -17,7 +17,8 @@ + open the shell behind it takes no input. The buttons of both lists form one group (GroupName); their check + binds one way, the section the shell navigates to (a GroupName spans every window not yet on screen). --> @@ -40,7 +41,7 @@ @@ -49,7 +50,7 @@ diff --git a/src/Titano.App/Shell/ScreenCapture.cs b/src/Titano.App/Shell/ScreenCapture.cs index 3ca5ecbb..f3dfbe2b 100644 --- a/src/Titano.App/Shell/ScreenCapture.cs +++ b/src/Titano.App/Shell/ScreenCapture.cs @@ -321,25 +321,12 @@ public static class ScreenCapture return false; } var bitmap = new RenderTargetBitmap(width, height, dpi.PixelsPerInchX, dpi.PixelsPerInchY, PixelFormats.Pbgra32); - bitmap.Render(window.FlowDirection == FlowDirection.RightToLeft ? Mirrored(root) : root); + // A right-to-left window's content already renders mirrored, as on screen. + bitmap.Render(root); var encoder = new PngBitmapEncoder(); encoder.Frames.Add(BitmapFrame.Create(bitmap)); using var stream = File.Create(path); encoder.Save(stream); return true; } - - /// - /// A right-to-left window is mirrored by a transform on the window itself, which rendering its content alone - /// would leave out (mirrored glyphs, left-to-right layout): draw the content through that mirror. - /// - private static DrawingVisual Mirrored(FrameworkElement root) - { - var size = new Rect(0, 0, root.ActualWidth, root.ActualHeight); - var visual = new DrawingVisual(); - using var dc = visual.RenderOpen(); - dc.PushTransform(new MatrixTransform(-1, 0, 0, 1, size.Width, 0)); - dc.DrawRectangle(new VisualBrush(root) { Stretch = Stretch.Fill, ViewboxUnits = BrushMappingMode.Absolute, Viewbox = size }, null, size); - return visual; - } } diff --git a/tests/Titano.App.Tests/Windows/ScreenSmokeTests.cs b/tests/Titano.App.Tests/Windows/ScreenSmokeTests.cs index a1aed285..49784149 100644 --- a/tests/Titano.App.Tests/Windows/ScreenSmokeTests.cs +++ b/tests/Titano.App.Tests/Windows/ScreenSmokeTests.cs @@ -138,7 +138,9 @@ public sealed class ScreenSmokeTests var window = app.Window; Assert.Equal(FlowDirection.RightToLeft, window.FlowDirection, "the main window opens mirrored"); var rail = (FrameworkElement)window.FindName("Rail"); - Assert.Equal(FlowDirection.RightToLeft, rail.FlowDirection, "the rail mirrors with the window (it starts on the right)"); + Assert.Equal(FlowDirection.RightToLeft, rail.FlowDirection, "the rail mirrors with the window"); + // The window's content carries the mirror (a capture of it alone reads right to left, as on screen). + Assert.Greater(rail.TranslatePoint(new Point(rail.ActualWidth / 2, 0), window).X, window.ActualWidth / 2, "the rail starts on the right"); // The first-run dialog keeps the shell behind it out of reach. Assert.True(app.Shell.IsWelcomeOpen);