From a5642eb318912b8226bb4d6b092e8e411fea397d Mon Sep 17 00:00:00 2001
From: Owen McGirr <o.a.mcgirr@gmail.com>
Date: Fri, 3 Jul 2026 17:16:06 +0100
Subject: [PATCH 1/4] Add custom window chrome

---
 .../Chrome/SwitchifyTitleBar.xaml             | 111 ++++++++++
 .../Chrome/SwitchifyTitleBar.xaml.cs          |  88 ++++++++
 src/SwitchifyPc.App/MainWindow.xaml           |  28 ++-
 src/SwitchifyPc.App/SettingsWindow.xaml       |  22 +-
 src/SwitchifyPc.Tests/ButtonStyleTests.cs     |   1 +
 src/SwitchifyPc.Tests/MainWindowTests.cs      |  67 ++++++
 src/SwitchifyPc.Tests/SettingsWindowTests.cs  |  53 +++++
 .../SwitchifyTitleBarTests.cs                 | 194 ++++++++++++++++++
 src/SwitchifyPc.Tests/WpfTestCollection.cs    |   9 +
 9 files changed, 567 insertions(+), 6 deletions(-)
 create mode 100644 src/SwitchifyPc.App/Chrome/SwitchifyTitleBar.xaml
 create mode 100644 src/SwitchifyPc.App/Chrome/SwitchifyTitleBar.xaml.cs
 create mode 100644 src/SwitchifyPc.Tests/SwitchifyTitleBarTests.cs
 create mode 100644 src/SwitchifyPc.Tests/WpfTestCollection.cs

diff --git a/src/SwitchifyPc.App/Chrome/SwitchifyTitleBar.xaml b/src/SwitchifyPc.App/Chrome/SwitchifyTitleBar.xaml
new file mode 100644
index 0000000..c1e9948
--- /dev/null
+++ b/src/SwitchifyPc.App/Chrome/SwitchifyTitleBar.xaml
@@ -0,0 +1,111 @@
+<UserControl x:Class="SwitchifyPc.App.Chrome.SwitchifyTitleBar"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:shell="clr-namespace:System.Windows.Shell;assembly=PresentationFramework"
+             Height="44"
+             Background="#D32F2F"
+             Foreground="White"
+             shell:WindowChrome.IsHitTestVisibleInChrome="True"
+             MouseLeftButtonDown="TitleBar_MouseLeftButtonDown">
+    <UserControl.Resources>
+        <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+
+        <Style x:Key="CaptionButton" TargetType="Button">
+            <Setter Property="Width" Value="44" />
+            <Setter Property="Height" Value="44" />
+            <Setter Property="Padding" Value="0" />
+            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="Foreground" Value="White" />
+            <Setter Property="FontSize" Value="15" />
+            <Setter Property="FontFamily" Value="Segoe UI" />
+            <Setter Property="Cursor" Value="Hand" />
+            <Setter Property="shell:WindowChrome.IsHitTestVisibleInChrome" Value="True" />
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="Button">
+                        <Border x:Name="Root" Background="{TemplateBinding Background}">
+                            <ContentPresenter HorizontalAlignment="Center"
+                                              VerticalAlignment="Center"
+                                              RecognizesAccessKey="False" />
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter TargetName="Root" Property="Background" Value="#B3261E" />
+                            </Trigger>
+                            <Trigger Property="IsPressed" Value="True">
+                                <Setter TargetName="Root" Property="Background" Value="#8F1D18" />
+                            </Trigger>
+                            <Trigger Property="IsEnabled" Value="False">
+                                <Setter TargetName="Root" Property="Opacity" Value="0.45" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
+        <Style x:Key="CloseCaptionButton" TargetType="Button" BasedOn="{StaticResource CaptionButton}">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="Button">
+                        <Border x:Name="Root" Background="{TemplateBinding Background}">
+                            <ContentPresenter HorizontalAlignment="Center"
+                                              VerticalAlignment="Center"
+                                              RecognizesAccessKey="False" />
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter TargetName="Root" Property="Background" Value="#C42B1C" />
+                            </Trigger>
+                            <Trigger Property="IsPressed" Value="True">
+                                <Setter TargetName="Root" Property="Background" Value="#8F1D18" />
+                            </Trigger>
+                            <Trigger Property="IsEnabled" Value="False">
+                                <Setter TargetName="Root" Property="Opacity" Value="0.45" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </UserControl.Resources>
+
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="Auto" />
+        </Grid.ColumnDefinitions>
+
+        <StackPanel Margin="14,0,10,0"
+                    Orientation="Horizontal"
+                    VerticalAlignment="Center">
+            <Image Width="18"
+                   Height="18"
+                   Source="../Assets/icon.ico" />
+            <TextBlock x:Name="TitleTextBlock"
+                       Margin="10,0,0,0"
+                       VerticalAlignment="Center"
+                       Text="{Binding TitleText, RelativeSource={RelativeSource AncestorType=UserControl}}"
+                       TextTrimming="CharacterEllipsis"
+                       FontSize="13"
+                       FontWeight="SemiBold"
+                       Foreground="White" />
+        </StackPanel>
+
+        <StackPanel Grid.Column="1"
+                    Orientation="Horizontal">
+            <Button x:Name="MinimizeButton"
+                    Content="-"
+                    Style="{StaticResource CaptionButton}"
+                    AutomationProperties.Name="Minimize"
+                    Visibility="{Binding ShowMinimizeButton, RelativeSource={RelativeSource AncestorType=UserControl}, Converter={StaticResource BooleanToVisibilityConverter}}"
+                    Click="MinimizeButton_Click" />
+            <Button x:Name="CloseButton"
+                    Content="x"
+                    Style="{StaticResource CloseCaptionButton}"
+                    AutomationProperties.Name="Close"
+                    Click="CloseButton_Click" />
+        </StackPanel>
+    </Grid>
+</UserControl>
diff --git a/src/SwitchifyPc.App/Chrome/SwitchifyTitleBar.xaml.cs b/src/SwitchifyPc.App/Chrome/SwitchifyTitleBar.xaml.cs
new file mode 100644
index 0000000..768934d
--- /dev/null
+++ b/src/SwitchifyPc.App/Chrome/SwitchifyTitleBar.xaml.cs
@@ -0,0 +1,88 @@
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+using WpfButton = System.Windows.Controls.Button;
+using WpfUserControl = System.Windows.Controls.UserControl;
+
+namespace SwitchifyPc.App.Chrome;
+
+public partial class SwitchifyTitleBar : WpfUserControl
+{
+    public static readonly DependencyProperty TitleTextProperty = DependencyProperty.Register(
+        nameof(TitleText),
+        typeof(string),
+        typeof(SwitchifyTitleBar),
+        new PropertyMetadata(string.Empty));
+
+    public static readonly DependencyProperty ShowMinimizeButtonProperty = DependencyProperty.Register(
+        nameof(ShowMinimizeButton),
+        typeof(bool),
+        typeof(SwitchifyTitleBar),
+        new PropertyMetadata(true));
+
+    public SwitchifyTitleBar()
+    {
+        InitializeComponent();
+    }
+
+    public string TitleText
+    {
+        get => (string)GetValue(TitleTextProperty);
+        set => SetValue(TitleTextProperty, value);
+    }
+
+    public bool ShowMinimizeButton
+    {
+        get => (bool)GetValue(ShowMinimizeButtonProperty);
+        set => SetValue(ShowMinimizeButtonProperty, value);
+    }
+
+    private void TitleBar_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        if (e.ClickCount != 1 || IsInsideButton(e.OriginalSource as DependencyObject))
+        {
+            return;
+        }
+
+        Window? window = Window.GetWindow(this);
+        if (window is null) return;
+
+        try
+        {
+            window.DragMove();
+        }
+        catch (InvalidOperationException)
+        {
+        }
+    }
+
+    private void MinimizeButton_Click(object sender, RoutedEventArgs e)
+    {
+        Window? window = Window.GetWindow(this);
+        if (window is not null)
+        {
+            window.WindowState = WindowState.Minimized;
+        }
+    }
+
+    private void CloseButton_Click(object sender, RoutedEventArgs e)
+    {
+        Window.GetWindow(this)?.Close();
+    }
+
+    private static bool IsInsideButton(DependencyObject? source)
+    {
+        while (source is not null)
+        {
+            if (source is WpfButton)
+            {
+                return true;
+            }
+
+            source = VisualTreeHelper.GetParent(source);
+        }
+
+        return false;
+    }
+}
diff --git a/src/SwitchifyPc.App/MainWindow.xaml b/src/SwitchifyPc.App/MainWindow.xaml
index 1e8539f..e550375 100644
--- a/src/SwitchifyPc.App/MainWindow.xaml
+++ b/src/SwitchifyPc.App/MainWindow.xaml
@@ -4,6 +4,8 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:ui="clr-namespace:SwitchifyPc.Core.Ui;assembly=SwitchifyPc.Core"
+        xmlns:shell="clr-namespace:System.Windows.Shell;assembly=PresentationFramework"
+        xmlns:chrome="clr-namespace:SwitchifyPc.App.Chrome"
         mc:Ignorable="d"
         Title="Switchify PC"
         MinHeight="520"
@@ -13,8 +15,17 @@
         Icon="Assets/icon.ico"
         FontFamily="Segoe UI"
         Background="#F5F4F7"
+        WindowStyle="None"
         WindowStartupLocation="CenterScreen"
         d:DataContext="{d:DesignInstance Type=ui:MainWindowViewModel, IsDesignTimeCreatable=True}">
+    <shell:WindowChrome.WindowChrome>
+        <shell:WindowChrome CaptionHeight="44"
+                            CornerRadius="0"
+                            GlassFrameThickness="0"
+                            ResizeBorderThickness="6"
+                            UseAeroCaptionButtons="False" />
+    </shell:WindowChrome.WindowChrome>
+
     <Window.Resources>
         <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
 
@@ -213,8 +224,18 @@
         </Style>
     </Window.Resources>
 
-    <Grid Background="#F5F4F7" Margin="24">
-        <Border HorizontalAlignment="Stretch"
+    <Grid Background="#F5F4F7">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="44" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+
+        <chrome:SwitchifyTitleBar Grid.Row="0"
+                                  TitleText="Switchify PC"
+                                  ShowMinimizeButton="True" />
+
+        <Grid Grid.Row="1" Margin="24">
+            <Border HorizontalAlignment="Stretch"
                 VerticalAlignment="Stretch"
                 Style="{StaticResource MainCard}">
             <ScrollViewer HorizontalScrollBarVisibility="Disabled"
@@ -497,6 +518,7 @@
                     </Expander>
                 </StackPanel>
             </ScrollViewer>
-        </Border>
+            </Border>
+        </Grid>
     </Grid>
 </Window>
diff --git a/src/SwitchifyPc.App/SettingsWindow.xaml b/src/SwitchifyPc.App/SettingsWindow.xaml
index 550b0bc..0d6c74d 100644
--- a/src/SwitchifyPc.App/SettingsWindow.xaml
+++ b/src/SwitchifyPc.App/SettingsWindow.xaml
@@ -4,6 +4,8 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:ui="clr-namespace:SwitchifyPc.Core.Ui;assembly=SwitchifyPc.Core"
+        xmlns:shell="clr-namespace:System.Windows.Shell;assembly=PresentationFramework"
+        xmlns:chrome="clr-namespace:SwitchifyPc.App.Chrome"
         mc:Ignorable="d"
         Title="Switchify PC settings"
         MinHeight="560"
@@ -14,8 +16,17 @@
         Icon="Assets/icon.ico"
         FontFamily="Segoe UI"
         Background="#F5F4F7"
+        WindowStyle="None"
         WindowStartupLocation="CenterScreen"
         d:DataContext="{d:DesignInstance Type=ui:SettingsViewModel, IsDesignTimeCreatable=True}">
+    <shell:WindowChrome.WindowChrome>
+        <shell:WindowChrome CaptionHeight="44"
+                            CornerRadius="0"
+                            GlassFrameThickness="0"
+                            ResizeBorderThickness="6"
+                            UseAeroCaptionButtons="False" />
+    </shell:WindowChrome.WindowChrome>
+
     <Window.Resources>
         <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
 
@@ -235,13 +246,18 @@
         </Style>
     </Window.Resources>
 
-    <Grid Background="#F5F4F7" Margin="24">
+    <Grid Background="#F5F4F7">
         <Grid.RowDefinitions>
+            <RowDefinition Height="44" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
 
-        <StackPanel>
+        <chrome:SwitchifyTitleBar Grid.Row="0"
+                                  TitleText="Switchify PC settings"
+                                  ShowMinimizeButton="True" />
+
+        <StackPanel Grid.Row="1" Margin="24,24,24,0">
             <TextBlock Text="Settings"
                        FontSize="18"
                        FontWeight="Bold"
@@ -251,7 +267,7 @@
                        Style="{StaticResource MutedText}" />
         </StackPanel>
 
-        <Grid Grid.Row="1">
+        <Grid Grid.Row="2" Margin="24,0,24,24">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="190" />
                 <ColumnDefinition Width="24" />
diff --git a/src/SwitchifyPc.Tests/ButtonStyleTests.cs b/src/SwitchifyPc.Tests/ButtonStyleTests.cs
index e05d6e7..e4ea3cc 100644
--- a/src/SwitchifyPc.Tests/ButtonStyleTests.cs
+++ b/src/SwitchifyPc.Tests/ButtonStyleTests.cs
@@ -8,6 +8,7 @@
 
 namespace SwitchifyPc.Tests;
 
+[Collection(WpfTestCollection.Name)]
 public sealed class ButtonStyleTests
 {
     [Fact]
diff --git a/src/SwitchifyPc.Tests/MainWindowTests.cs b/src/SwitchifyPc.Tests/MainWindowTests.cs
index 6017abf..705524c 100644
--- a/src/SwitchifyPc.Tests/MainWindowTests.cs
+++ b/src/SwitchifyPc.Tests/MainWindowTests.cs
@@ -1,10 +1,16 @@
 using System.Threading;
 using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Media;
+using System.Windows.Shell;
 using SwitchifyPc.App;
 using SwitchifyPc.Core.Ui;
+using WpfButton = System.Windows.Controls.Button;
 
 namespace SwitchifyPc.Tests;
 
+[Collection(WpfTestCollection.Name)]
 public sealed class MainWindowTests
 {
     [Fact]
@@ -31,6 +37,30 @@ public void MainWindowLoadsWithAndroidDownloadPrompt()
         });
     }
 
+    [Fact]
+    public void MainWindowUsesCustomChrome()
+    {
+        RunOnSta(() =>
+        {
+            MainWindow window = new(new MainWindowViewModel());
+            try
+            {
+                window.Show();
+                window.UpdateLayout();
+
+                Assert.Equal(WindowStyle.None, window.WindowStyle);
+                Assert.NotNull(WindowChrome.GetWindowChrome(window));
+                Assert.Contains("Switchify PC", TextBlocks(window));
+                Assert.NotNull(ButtonByAutomationName(window, "Minimize"));
+                Assert.NotNull(ButtonByAutomationName(window, "Close"));
+            }
+            finally
+            {
+                window.Close();
+            }
+        });
+    }
+
     private static void RunOnSta(Action action)
     {
         Exception? exception = null;
@@ -52,4 +82,41 @@ private static void RunOnSta(Action action)
 
         if (exception is not null) throw exception;
     }
+
+    private static IReadOnlyList<string> TextBlocks(DependencyObject root)
+    {
+        List<string> text = [];
+        Collect(root, node =>
+        {
+            if (node is TextBlock textBlock)
+            {
+                text.Add(textBlock.Text);
+            }
+        });
+        return text;
+    }
+
+    private static WpfButton? ButtonByAutomationName(DependencyObject root, string name)
+    {
+        WpfButton? result = null;
+        Collect(root, node =>
+        {
+            if (result is null &&
+                node is WpfButton button &&
+                AutomationProperties.GetName(button) == name)
+            {
+                result = button;
+            }
+        });
+        return result;
+    }
+
+    private static void Collect(DependencyObject node, Action<DependencyObject> visit)
+    {
+        visit(node);
+        for (int index = 0; index < VisualTreeHelper.GetChildrenCount(node); index++)
+        {
+            Collect(VisualTreeHelper.GetChild(node, index), visit);
+        }
+    }
 }
diff --git a/src/SwitchifyPc.Tests/SettingsWindowTests.cs b/src/SwitchifyPc.Tests/SettingsWindowTests.cs
index e5412a1..41f79bb 100644
--- a/src/SwitchifyPc.Tests/SettingsWindowTests.cs
+++ b/src/SwitchifyPc.Tests/SettingsWindowTests.cs
@@ -1,13 +1,17 @@
 using System.Threading;
 using System.Windows;
+using System.Windows.Automation;
 using System.Windows.Controls;
 using System.Windows.Media;
+using System.Windows.Shell;
 using SwitchifyPc.App;
 using SwitchifyPc.Core.Ui;
 using SwitchifyPc.Core.Updates;
+using WpfButton = System.Windows.Controls.Button;
 
 namespace SwitchifyPc.Tests;
 
+[Collection(WpfTestCollection.Name)]
 public sealed class SettingsWindowTests
 {
     [Fact]
@@ -64,6 +68,31 @@ public void SettingsWindowShowsSeparateMouseRepeatIntervals()
         });
     }
 
+    [Fact]
+    public void SettingsWindowUsesCustomChrome()
+    {
+        RunOnSta(() =>
+        {
+            SettingsWindow window = new(new SettingsViewModel());
+            try
+            {
+                window.Show();
+                window.UpdateLayout();
+
+                Assert.Equal(WindowStyle.None, window.WindowStyle);
+                Assert.Equal(ResizeMode.NoResize, window.ResizeMode);
+                Assert.NotNull(WindowChrome.GetWindowChrome(window));
+                Assert.Contains("Switchify PC settings", TextBlocks(window));
+                Assert.NotNull(ButtonByAutomationName(window, "Minimize"));
+                Assert.NotNull(ButtonByAutomationName(window, "Close"));
+            }
+            finally
+            {
+                window.Close();
+            }
+        });
+    }
+
     private static void RunOnSta(Action action)
     {
         Exception? exception = null;
@@ -105,4 +134,28 @@ private static void CollectTextBlocks(DependencyObject node, List<string> text)
             CollectTextBlocks(VisualTreeHelper.GetChild(node, index), text);
         }
     }
+
+    private static WpfButton? ButtonByAutomationName(DependencyObject root, string name)
+    {
+        WpfButton? result = null;
+        Collect(root, node =>
+        {
+            if (result is null &&
+                node is WpfButton button &&
+                AutomationProperties.GetName(button) == name)
+            {
+                result = button;
+            }
+        });
+        return result;
+    }
+
+    private static void Collect(DependencyObject node, Action<DependencyObject> visit)
+    {
+        visit(node);
+        for (int index = 0; index < VisualTreeHelper.GetChildrenCount(node); index++)
+        {
+            Collect(VisualTreeHelper.GetChild(node, index), visit);
+        }
+    }
 }
diff --git a/src/SwitchifyPc.Tests/SwitchifyTitleBarTests.cs b/src/SwitchifyPc.Tests/SwitchifyTitleBarTests.cs
new file mode 100644
index 0000000..586833e
--- /dev/null
+++ b/src/SwitchifyPc.Tests/SwitchifyTitleBarTests.cs
@@ -0,0 +1,194 @@
+using System.Threading;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Media;
+using SwitchifyPc.App.Chrome;
+using WpfButton = System.Windows.Controls.Button;
+
+namespace SwitchifyPc.Tests;
+
+[Collection(WpfTestCollection.Name)]
+public sealed class SwitchifyTitleBarTests
+{
+    [Fact]
+    public void ExposesTitleText()
+    {
+        RunOnSta(() =>
+        {
+            SwitchifyTitleBar titleBar = new()
+            {
+                TitleText = "Switchify PC test"
+            };
+            Window window = new()
+            {
+                Content = titleBar,
+                Width = 320,
+                Height = 120
+            };
+            try
+            {
+                window.Show();
+                window.UpdateLayout();
+
+                Assert.Contains("Switchify PC test", TextBlocks(window));
+            }
+            finally
+            {
+                window.Close();
+            }
+        });
+    }
+
+    [Fact]
+    public void MinimizeButtonSetsParentWindowState()
+    {
+        RunOnSta(() =>
+        {
+            SwitchifyTitleBar titleBar = new();
+            Window window = new()
+            {
+                Content = titleBar,
+                Width = 320,
+                Height = 120
+            };
+            try
+            {
+                window.Show();
+                window.UpdateLayout();
+
+                WpfButton minimize = Assert.IsType<WpfButton>(ButtonByAutomationName(window, "Minimize"));
+                minimize.RaiseEvent(new RoutedEventArgs(WpfButton.ClickEvent));
+
+                Assert.Equal(WindowState.Minimized, window.WindowState);
+            }
+            finally
+            {
+                window.Close();
+            }
+        });
+    }
+
+    [Fact]
+    public void CloseButtonInvokesParentWindowClose()
+    {
+        RunOnSta(() =>
+        {
+            bool closingCalled = false;
+            SwitchifyTitleBar titleBar = new();
+            Window window = new()
+            {
+                Content = titleBar,
+                Width = 320,
+                Height = 120
+            };
+            window.Closing += (_, _) => closingCalled = true;
+            try
+            {
+                window.Show();
+                window.UpdateLayout();
+
+                WpfButton close = Assert.IsType<WpfButton>(ButtonByAutomationName(window, "Close"));
+                close.RaiseEvent(new RoutedEventArgs(WpfButton.ClickEvent));
+
+                Assert.True(closingCalled);
+            }
+            finally
+            {
+                if (window.IsVisible)
+                {
+                    window.Close();
+                }
+            }
+        });
+    }
+
+    [Fact]
+    public void CanHideMinimizeButton()
+    {
+        RunOnSta(() =>
+        {
+            SwitchifyTitleBar titleBar = new()
+            {
+                ShowMinimizeButton = false
+            };
+            Window window = new()
+            {
+                Content = titleBar,
+                Width = 320,
+                Height = 120
+            };
+            try
+            {
+                window.Show();
+                window.UpdateLayout();
+
+                WpfButton minimize = Assert.IsType<WpfButton>(ButtonByAutomationName(window, "Minimize"));
+                Assert.Equal(Visibility.Collapsed, minimize.Visibility);
+            }
+            finally
+            {
+                window.Close();
+            }
+        });
+    }
+
+    private static void RunOnSta(Action action)
+    {
+        Exception? exception = null;
+        Thread thread = new(() =>
+        {
+            try
+            {
+                action();
+            }
+            catch (Exception error)
+            {
+                exception = error;
+            }
+        });
+
+        thread.SetApartmentState(ApartmentState.STA);
+        thread.Start();
+        thread.Join();
+
+        if (exception is not null) throw exception;
+    }
+
+    private static IReadOnlyList<string> TextBlocks(DependencyObject root)
+    {
+        List<string> text = [];
+        Collect(root, node =>
+        {
+            if (node is TextBlock textBlock)
+            {
+                text.Add(textBlock.Text);
+            }
+        });
+        return text;
+    }
+
+    private static WpfButton? ButtonByAutomationName(DependencyObject root, string name)
+    {
+        WpfButton? result = null;
+        Collect(root, node =>
+        {
+            if (result is null &&
+                node is WpfButton button &&
+                AutomationProperties.GetName(button) == name)
+            {
+                result = button;
+            }
+        });
+        return result;
+    }
+
+    private static void Collect(DependencyObject node, Action<DependencyObject> visit)
+    {
+        visit(node);
+        for (int index = 0; index < VisualTreeHelper.GetChildrenCount(node); index++)
+        {
+            Collect(VisualTreeHelper.GetChild(node, index), visit);
+        }
+    }
+}
diff --git a/src/SwitchifyPc.Tests/WpfTestCollection.cs b/src/SwitchifyPc.Tests/WpfTestCollection.cs
new file mode 100644
index 0000000..ab5e977
--- /dev/null
+++ b/src/SwitchifyPc.Tests/WpfTestCollection.cs
@@ -0,0 +1,9 @@
+using Xunit;
+
+namespace SwitchifyPc.Tests;
+
+[CollectionDefinition(Name, DisableParallelization = true)]
+public sealed class WpfTestCollection
+{
+    public const string Name = "WPF tests";
+}

From 82a260a08e14fea4267dc37b82d3b9d1e42b8d10 Mon Sep 17 00:00:00 2001
From: Owen McGirr <o.a.mcgirr@gmail.com>
Date: Fri, 3 Jul 2026 17:27:49 +0100
Subject: [PATCH 2/4] Make custom chrome bleed edge to edge

---
 src/SwitchifyPc.App/MainWindow.xaml     | 12 +++++++-----
 src/SwitchifyPc.App/SettingsWindow.xaml |  8 ++++++--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/SwitchifyPc.App/MainWindow.xaml b/src/SwitchifyPc.App/MainWindow.xaml
index e550375..c1d2c33 100644
--- a/src/SwitchifyPc.App/MainWindow.xaml
+++ b/src/SwitchifyPc.App/MainWindow.xaml
@@ -14,7 +14,7 @@
         Width="920"
         Icon="Assets/icon.ico"
         FontFamily="Segoe UI"
-        Background="#F5F4F7"
+        Background="#D32F2F"
         WindowStyle="None"
         WindowStartupLocation="CenterScreen"
         d:DataContext="{d:DesignInstance Type=ui:MainWindowViewModel, IsDesignTimeCreatable=True}">
@@ -224,7 +224,7 @@
         </Style>
     </Window.Resources>
 
-    <Grid Background="#F5F4F7">
+    <Grid Background="#D32F2F">
         <Grid.RowDefinitions>
             <RowDefinition Height="44" />
             <RowDefinition Height="*" />
@@ -234,8 +234,9 @@
                                   TitleText="Switchify PC"
                                   ShowMinimizeButton="True" />
 
-        <Grid Grid.Row="1" Margin="24">
-            <Border HorizontalAlignment="Stretch"
+        <Grid Grid.Row="1" Background="#F5F4F7">
+            <Grid Margin="24">
+                <Border HorizontalAlignment="Stretch"
                 VerticalAlignment="Stretch"
                 Style="{StaticResource MainCard}">
             <ScrollViewer HorizontalScrollBarVisibility="Disabled"
@@ -518,7 +519,8 @@
                     </Expander>
                 </StackPanel>
             </ScrollViewer>
-            </Border>
+                </Border>
+            </Grid>
         </Grid>
     </Grid>
 </Window>
diff --git a/src/SwitchifyPc.App/SettingsWindow.xaml b/src/SwitchifyPc.App/SettingsWindow.xaml
index 0d6c74d..e7b7b81 100644
--- a/src/SwitchifyPc.App/SettingsWindow.xaml
+++ b/src/SwitchifyPc.App/SettingsWindow.xaml
@@ -15,7 +15,7 @@
         ResizeMode="NoResize"
         Icon="Assets/icon.ico"
         FontFamily="Segoe UI"
-        Background="#F5F4F7"
+        Background="#D32F2F"
         WindowStyle="None"
         WindowStartupLocation="CenterScreen"
         d:DataContext="{d:DesignInstance Type=ui:SettingsViewModel, IsDesignTimeCreatable=True}">
@@ -246,7 +246,7 @@
         </Style>
     </Window.Resources>
 
-    <Grid Background="#F5F4F7">
+    <Grid Background="#D32F2F">
         <Grid.RowDefinitions>
             <RowDefinition Height="44" />
             <RowDefinition Height="Auto" />
@@ -257,6 +257,10 @@
                                   TitleText="Switchify PC settings"
                                   ShowMinimizeButton="True" />
 
+        <Border Grid.Row="1"
+                Grid.RowSpan="2"
+                Background="#F5F4F7" />
+
         <StackPanel Grid.Row="1" Margin="24,24,24,0">
             <TextBlock Text="Settings"
                        FontSize="18"

From e67e79755ffbe40bb063546268d7a3b442ba7320 Mon Sep 17 00:00:00 2001
From: Owen McGirr <o.a.mcgirr@gmail.com>
Date: Fri, 3 Jul 2026 17:40:37 +0100
Subject: [PATCH 3/4] Extend chrome bleed behind content

---
 src/SwitchifyPc.App/MainWindow.xaml     | 4 +++-
 src/SwitchifyPc.App/SettingsWindow.xaml | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/SwitchifyPc.App/MainWindow.xaml b/src/SwitchifyPc.App/MainWindow.xaml
index c1d2c33..07134ae 100644
--- a/src/SwitchifyPc.App/MainWindow.xaml
+++ b/src/SwitchifyPc.App/MainWindow.xaml
@@ -234,7 +234,9 @@
                                   TitleText="Switchify PC"
                                   ShowMinimizeButton="True" />
 
-        <Grid Grid.Row="1" Background="#F5F4F7">
+        <Grid Grid.Row="1" Background="#D32F2F">
+            <Border Margin="0,96,0,0"
+                    Background="#F5F4F7" />
             <Grid Margin="24">
                 <Border HorizontalAlignment="Stretch"
                 VerticalAlignment="Stretch"
diff --git a/src/SwitchifyPc.App/SettingsWindow.xaml b/src/SwitchifyPc.App/SettingsWindow.xaml
index e7b7b81..6dbab6f 100644
--- a/src/SwitchifyPc.App/SettingsWindow.xaml
+++ b/src/SwitchifyPc.App/SettingsWindow.xaml
@@ -259,6 +259,7 @@
 
         <Border Grid.Row="1"
                 Grid.RowSpan="2"
+                Margin="0,80,0,0"
                 Background="#F5F4F7" />
 
         <StackPanel Grid.Row="1" Margin="24,24,24,0">

From 6fc056ea45736e39512cfc111f36ca33221ffba0 Mon Sep 17 00:00:00 2001
From: Owen McGirr <o.a.mcgirr@gmail.com>
Date: Fri, 3 Jul 2026 17:45:29 +0100
Subject: [PATCH 4/4] Use light settings header copy on chrome bleed

---
 src/SwitchifyPc.App/SettingsWindow.xaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/SwitchifyPc.App/SettingsWindow.xaml b/src/SwitchifyPc.App/SettingsWindow.xaml
index 6dbab6f..c6e586d 100644
--- a/src/SwitchifyPc.App/SettingsWindow.xaml
+++ b/src/SwitchifyPc.App/SettingsWindow.xaml
@@ -266,9 +266,10 @@
             <TextBlock Text="Settings"
                        FontSize="18"
                        FontWeight="Bold"
-                       Foreground="{StaticResource Text}" />
+                       Foreground="White" />
             <TextBlock Margin="0,4,0,18"
                        Text="Tune how Switchify starts, connects, and controls this PC."
+                       Foreground="#FDE8E8"
                        Style="{StaticResource MutedText}" />
         </StackPanel>