From e09ab17b0ee44babc71169bd58c60620fef40981 Mon Sep 17 00:00:00 2001
From: Owen McGirr <o.a.mcgirr@gmail.com>
Date: Fri, 3 Jul 2026 19:53:33 +0100
Subject: [PATCH] Move connection status to title bar

---
 .../Chrome/SwitchifyTitleBar.xaml             |  56 +++++++-
 .../Chrome/SwitchifyTitleBar.xaml.cs          |  36 +++++
 src/SwitchifyPc.App/MainWindow.xaml           |  52 +------
 src/SwitchifyPc.Tests/MainWindowTests.cs      |  76 +++++++++++
 .../SwitchifyTitleBarTests.cs                 | 129 ++++++++++++++++++
 5 files changed, 300 insertions(+), 49 deletions(-)

diff --git a/src/SwitchifyPc.App/Chrome/SwitchifyTitleBar.xaml b/src/SwitchifyPc.App/Chrome/SwitchifyTitleBar.xaml
index 605dc3d..1c555aa 100644
--- a/src/SwitchifyPc.App/Chrome/SwitchifyTitleBar.xaml
+++ b/src/SwitchifyPc.App/Chrome/SwitchifyTitleBar.xaml
@@ -69,12 +69,33 @@
                 </Setter.Value>
             </Setter>
         </Style>
+
+        <Style x:Key="TitleBarStatusDot" TargetType="Ellipse">
+            <Setter Property="Width" Value="8" />
+            <Setter Property="Height" Value="8" />
+            <Setter Property="Fill" Value="{DynamicResource ChromeSubtleForeground}" />
+            <Style.Triggers>
+                <DataTrigger Binding="{Binding StatusTone, RelativeSource={RelativeSource AncestorType=UserControl}}" Value="ready">
+                    <Setter Property="Fill" Value="{DynamicResource StatusOk}" />
+                </DataTrigger>
+                <DataTrigger Binding="{Binding StatusTone, RelativeSource={RelativeSource AncestorType=UserControl}}" Value="connected">
+                    <Setter Property="Fill" Value="{DynamicResource StatusOk}" />
+                </DataTrigger>
+                <DataTrigger Binding="{Binding StatusTone, RelativeSource={RelativeSource AncestorType=UserControl}}" Value="waiting">
+                    <Setter Property="Fill" Value="{DynamicResource StatusWarn}" />
+                </DataTrigger>
+                <DataTrigger Binding="{Binding StatusTone, RelativeSource={RelativeSource AncestorType=UserControl}}" Value="error">
+                    <Setter Property="Fill" Value="{DynamicResource StatusError}" />
+                </DataTrigger>
+            </Style.Triggers>
+        </Style>
     </UserControl.Resources>
 
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*" />
             <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
         </Grid.ColumnDefinitions>
 
         <StackPanel Margin="14,0,10,0"
@@ -93,7 +114,40 @@
                        Foreground="{DynamicResource ChromeForeground}" />
         </StackPanel>
 
-        <StackPanel Grid.Column="1"
+        <Border x:Name="TitleBarStatusBadge"
+                Grid.Column="1"
+                Height="28"
+                MaxWidth="220"
+                Margin="8,0,8,0"
+                Padding="10,0"
+                VerticalAlignment="Center"
+                Background="#22FFFFFF"
+                BorderBrush="{DynamicResource ChromeSubtleForeground}"
+                BorderThickness="1"
+                CornerRadius="14"
+                AutomationProperties.AutomationId="TitleBarStatusBadge"
+                AutomationProperties.Name="{Binding StatusText, RelativeSource={RelativeSource AncestorType=UserControl}}"
+                Visibility="{Binding ShowStatusBadge, RelativeSource={RelativeSource AncestorType=UserControl}, Converter={StaticResource BooleanToVisibilityConverter}}">
+            <Grid VerticalAlignment="Center">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <Ellipse x:Name="TitleBarStatusDot"
+                         VerticalAlignment="Center"
+                         Style="{StaticResource TitleBarStatusDot}" />
+                <TextBlock Grid.Column="1"
+                           Margin="8,0,0,0"
+                           VerticalAlignment="Center"
+                           Text="{Binding StatusText, RelativeSource={RelativeSource AncestorType=UserControl}}"
+                           TextTrimming="CharacterEllipsis"
+                           Foreground="{DynamicResource ChromeForeground}"
+                           FontSize="12"
+                           FontWeight="SemiBold" />
+            </Grid>
+        </Border>
+
+        <StackPanel Grid.Column="2"
                     Orientation="Horizontal">
             <Button x:Name="MinimizeButton"
                     Content="-"
diff --git a/src/SwitchifyPc.App/Chrome/SwitchifyTitleBar.xaml.cs b/src/SwitchifyPc.App/Chrome/SwitchifyTitleBar.xaml.cs
index 768934d..16d5b7e 100644
--- a/src/SwitchifyPc.App/Chrome/SwitchifyTitleBar.xaml.cs
+++ b/src/SwitchifyPc.App/Chrome/SwitchifyTitleBar.xaml.cs
@@ -21,6 +21,24 @@ public partial class SwitchifyTitleBar : WpfUserControl
         typeof(SwitchifyTitleBar),
         new PropertyMetadata(true));
 
+    public static readonly DependencyProperty StatusTextProperty = DependencyProperty.Register(
+        nameof(StatusText),
+        typeof(string),
+        typeof(SwitchifyTitleBar),
+        new PropertyMetadata(null));
+
+    public static readonly DependencyProperty StatusToneProperty = DependencyProperty.Register(
+        nameof(StatusTone),
+        typeof(string),
+        typeof(SwitchifyTitleBar),
+        new PropertyMetadata(null));
+
+    public static readonly DependencyProperty ShowStatusBadgeProperty = DependencyProperty.Register(
+        nameof(ShowStatusBadge),
+        typeof(bool),
+        typeof(SwitchifyTitleBar),
+        new PropertyMetadata(false));
+
     public SwitchifyTitleBar()
     {
         InitializeComponent();
@@ -38,6 +56,24 @@ public bool ShowMinimizeButton
         set => SetValue(ShowMinimizeButtonProperty, value);
     }
 
+    public string? StatusText
+    {
+        get => (string?)GetValue(StatusTextProperty);
+        set => SetValue(StatusTextProperty, value);
+    }
+
+    public string? StatusTone
+    {
+        get => (string?)GetValue(StatusToneProperty);
+        set => SetValue(StatusToneProperty, value);
+    }
+
+    public bool ShowStatusBadge
+    {
+        get => (bool)GetValue(ShowStatusBadgeProperty);
+        set => SetValue(ShowStatusBadgeProperty, value);
+    }
+
     private void TitleBar_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
     {
         if (e.ClickCount != 1 || IsInsideButton(e.OriginalSource as DependencyObject))
diff --git a/src/SwitchifyPc.App/MainWindow.xaml b/src/SwitchifyPc.App/MainWindow.xaml
index 0a2b591..cfdde85 100644
--- a/src/SwitchifyPc.App/MainWindow.xaml
+++ b/src/SwitchifyPc.App/MainWindow.xaml
@@ -142,36 +142,6 @@
             </Style.Triggers>
         </Style>
 
-        <Style x:Key="StatusBadge" TargetType="Border">
-            <Setter Property="Background" Value="{DynamicResource Surface}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource BorderColor}" />
-            <Setter Property="BorderThickness" Value="1" />
-            <Setter Property="CornerRadius" Value="8" />
-            <Setter Property="Padding" Value="10,8" />
-            <Setter Property="MinHeight" Value="40" />
-            <Setter Property="MinWidth" Value="112" />
-        </Style>
-
-        <Style x:Key="StatusDot" TargetType="Ellipse">
-            <Setter Property="Width" Value="9" />
-            <Setter Property="Height" Value="9" />
-            <Setter Property="Fill" Value="{DynamicResource TextMuted}" />
-            <Style.Triggers>
-                <DataTrigger Binding="{Binding StatusBadgeTone}" Value="ready">
-                    <Setter Property="Fill" Value="{DynamicResource StatusOk}" />
-                </DataTrigger>
-                <DataTrigger Binding="{Binding StatusBadgeTone}" Value="connected">
-                    <Setter Property="Fill" Value="{DynamicResource StatusOk}" />
-                </DataTrigger>
-                <DataTrigger Binding="{Binding StatusBadgeTone}" Value="waiting">
-                    <Setter Property="Fill" Value="{DynamicResource StatusWarn}" />
-                </DataTrigger>
-                <DataTrigger Binding="{Binding StatusBadgeTone}" Value="error">
-                    <Setter Property="Fill" Value="{DynamicResource StatusError}" />
-                </DataTrigger>
-            </Style.Triggers>
-        </Style>
-
         <Style x:Key="PrimaryStatusDot" TargetType="Ellipse">
             <Setter Property="Width" Value="10" />
             <Setter Property="Height" Value="10" />
@@ -219,7 +189,10 @@
 
         <chrome:SwitchifyTitleBar Grid.Row="0"
                                   TitleText="Switchify PC"
-                                  ShowMinimizeButton="True" />
+                                  ShowMinimizeButton="True"
+                                  ShowStatusBadge="True"
+                                  StatusText="{Binding StatusBadgeLabel}"
+                                  StatusTone="{Binding StatusBadgeTone}" />
 
         <Grid Grid.Row="1" Background="{DynamicResource ChromeBackground}">
             <Border Margin="0,96,0,0"
@@ -256,23 +229,6 @@
                             <Button Content="Settings"
                                     Padding="16,0"
                                     Click="OpenSettings_Click" />
-                            <Border Margin="8,0,0,0"
-                                    Style="{StaticResource StatusBadge}">
-                                <Grid VerticalAlignment="Center">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto" />
-                                        <ColumnDefinition Width="*" />
-                                    </Grid.ColumnDefinitions>
-                                    <Ellipse Style="{StaticResource StatusDot}" />
-                                    <TextBlock Grid.Column="1"
-                                               Margin="8,0,0,0"
-                                               VerticalAlignment="Center"
-                                               Text="{Binding StatusBadgeLabel}"
-                                               Foreground="{DynamicResource Text}"
-                                               FontSize="12"
-                                               FontWeight="SemiBold" />
-                                </Grid>
-                            </Border>
                         </StackPanel>
                     </Grid>
 
diff --git a/src/SwitchifyPc.Tests/MainWindowTests.cs b/src/SwitchifyPc.Tests/MainWindowTests.cs
index e8863b6..69bab8e 100644
--- a/src/SwitchifyPc.Tests/MainWindowTests.cs
+++ b/src/SwitchifyPc.Tests/MainWindowTests.cs
@@ -5,7 +5,9 @@
 using System.Windows.Media;
 using System.Windows.Shell;
 using SwitchifyPc.App;
+using SwitchifyPc.App.Chrome;
 using SwitchifyPc.App.Themes;
+using SwitchifyPc.Core.Bluetooth;
 using SwitchifyPc.Core.Ui;
 using WpfButton = System.Windows.Controls.Button;
 using WpfColor = System.Windows.Media.Color;
@@ -89,6 +91,48 @@ public void MainWindowLoadsWithDarkTheme()
         });
     }
 
+    [Fact]
+    public void MainWindowShowsConnectionStatusInTitleBar()
+    {
+        RunOnSta(() =>
+        {
+            WpfTestApplication.ApplyTheme(AppTheme.Light);
+            MainWindowViewModel viewModel = new();
+            viewModel.SetBluetoothState(
+                DesktopUiState.Connected,
+                BluetoothStatusModel.DefaultStatus with
+                {
+                    Status = "connected",
+                    ConnectedClientCount = 1,
+                    System = BluetoothStatusModel.DefaultSystemStatus with
+                    {
+                        AdapterPresent = true,
+                        RadioState = "on",
+                        IsLowEnergySupported = true,
+                        IsPeripheralRoleSupported = true
+                    }
+                });
+
+            MainWindow window = new(viewModel);
+            try
+            {
+                window.Show();
+                window.UpdateLayout();
+
+                FrameworkElement badge = Assert.IsType<Border>(ElementByAutomationId(window, "TitleBarStatusBadge"));
+                Assert.Equal(Visibility.Visible, badge.Visibility);
+                Assert.Equal("Connected", AutomationProperties.GetName(badge));
+
+                SwitchifyTitleBar titleBar = Assert.IsType<SwitchifyTitleBar>(Ancestor<SwitchifyTitleBar>(badge));
+                Assert.Contains("Connected", TextBlocks(titleBar));
+            }
+            finally
+            {
+                window.Close();
+            }
+        });
+    }
+
     private static void RunOnSta(Action action)
     {
         Exception? exception = null;
@@ -139,6 +183,38 @@ node is WpfButton button &&
         return result;
     }
 
+    private static FrameworkElement? ElementByAutomationId(DependencyObject root, string automationId)
+    {
+        FrameworkElement? result = null;
+        Collect(root, node =>
+        {
+            if (result is null &&
+                node is FrameworkElement element &&
+                AutomationProperties.GetAutomationId(element) == automationId)
+            {
+                result = element;
+            }
+        });
+        return result;
+    }
+
+    private static T? Ancestor<T>(DependencyObject node)
+        where T : DependencyObject
+    {
+        DependencyObject? current = node;
+        while (current is not null)
+        {
+            if (current is T match)
+            {
+                return match;
+            }
+
+            current = VisualTreeHelper.GetParent(current);
+        }
+
+        return null;
+    }
+
     private static void Collect(DependencyObject node, Action<DependencyObject> visit)
     {
         visit(node);
diff --git a/src/SwitchifyPc.Tests/SwitchifyTitleBarTests.cs b/src/SwitchifyPc.Tests/SwitchifyTitleBarTests.cs
index ab1c8f9..4e4482b 100644
--- a/src/SwitchifyPc.Tests/SwitchifyTitleBarTests.cs
+++ b/src/SwitchifyPc.Tests/SwitchifyTitleBarTests.cs
@@ -3,6 +3,7 @@
 using System.Windows.Automation;
 using System.Windows.Controls;
 using System.Windows.Media;
+using System.Windows.Shapes;
 using SwitchifyPc.App.Chrome;
 using SwitchifyPc.App.Themes;
 using WpfButton = System.Windows.Controls.Button;
@@ -139,6 +140,104 @@ public void CanHideMinimizeButton()
         });
     }
 
+    [Fact]
+    public void StatusBadgeIsHiddenByDefault()
+    {
+        RunOnSta(() =>
+        {
+            WpfTestApplication.ApplyTheme(AppTheme.Light);
+            SwitchifyTitleBar titleBar = new();
+            Window window = new()
+            {
+                Content = titleBar,
+                Width = 420,
+                Height = 120
+            };
+            try
+            {
+                window.Show();
+                window.UpdateLayout();
+
+                FrameworkElement? badge = ElementByAutomationId(window, "TitleBarStatusBadge");
+                Assert.True(badge is null || badge.Visibility != Visibility.Visible);
+            }
+            finally
+            {
+                window.Close();
+            }
+        });
+    }
+
+    [Fact]
+    public void ShowsStatusBadgeWhenEnabled()
+    {
+        RunOnSta(() =>
+        {
+            WpfTestApplication.ApplyTheme(AppTheme.Light);
+            SwitchifyTitleBar titleBar = new()
+            {
+                ShowStatusBadge = true,
+                StatusText = "Connected",
+                StatusTone = "connected"
+            };
+            Window window = new()
+            {
+                Content = titleBar,
+                Width = 420,
+                Height = 120
+            };
+            try
+            {
+                window.Show();
+                window.UpdateLayout();
+
+                Assert.Contains("Connected", TextBlocks(window));
+                FrameworkElement badge = Assert.IsType<Border>(ElementByAutomationId(window, "TitleBarStatusBadge"));
+                Assert.Equal(Visibility.Visible, badge.Visibility);
+                Assert.Equal("Connected", AutomationProperties.GetName(badge));
+            }
+            finally
+            {
+                window.Close();
+            }
+        });
+    }
+
+    [Fact]
+    public void StatusBadgeUsesWarningTone()
+    {
+        RunOnSta(() =>
+        {
+            WpfTestApplication.ApplyTheme(AppTheme.Light);
+            SwitchifyTitleBar titleBar = new()
+            {
+                ShowStatusBadge = true,
+                StatusText = "Starting...",
+                StatusTone = "waiting"
+            };
+            Window window = new()
+            {
+                Content = titleBar,
+                Width = 420,
+                Height = 120
+            };
+            try
+            {
+                window.Show();
+                window.UpdateLayout();
+
+                Ellipse dot = Assert.IsType<Ellipse>(ElementByName(window, "TitleBarStatusDot"));
+                SolidColorBrush fill = Assert.IsType<SolidColorBrush>(dot.Fill);
+                SolidColorBrush warning = Assert.IsType<SolidColorBrush>(titleBar.FindResource("StatusWarn"));
+                Assert.Equal(warning.Color, fill.Color);
+            }
+            finally
+            {
+                window.Close();
+            }
+        });
+    }
+
     [Fact]
     public void UsesDarkChromeBackgroundResource()
     {
@@ -220,6 +319,36 @@ node is WpfButton button &&
         return result;
     }
 
+    private static FrameworkElement? ElementByAutomationId(DependencyObject root, string automationId)
+    {
+        FrameworkElement? result = null;
+        Collect(root, node =>
+        {
+            if (result is null &&
+                node is FrameworkElement element &&
+                AutomationProperties.GetAutomationId(element) == automationId)
+            {
+                result = element;
+            }
+        });
+        return result;
+    }
+
+    private static FrameworkElement? ElementByName(DependencyObject root, string name)
+    {
+        FrameworkElement? result = null;
+        Collect(root, node =>
+        {
+            if (result is null &&
+                node is FrameworkElement element &&
+                element.Name == name)
+            {
+                result = element;
+            }
+        });
+        return result;
+    }
+
     private static void Collect(DependencyObject node, Action<DependencyObject> visit)
     {
         visit(node);