From 8fd85061a9bd63e2bf20651b0bcd3703a464e6ba Mon Sep 17 00:00:00 2001
From: keyldev <wudgexyz@gmail.com>
Date: Thu, 2 Jul 2026 19:20:57 +0300
Subject: [PATCH 1/7] fix(desktop): force process exit after shutdown

- returning from Main left the process alive in Task Manager on Windows 10
- graceful dispose (bounded 10s) still runs first; Environment.Exit is the backstop
---
 src/OpenIPC.Viewer.Desktop/Program.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/OpenIPC.Viewer.Desktop/Program.cs b/src/OpenIPC.Viewer.Desktop/Program.cs
index 89eb9bf..acbeb98 100644
--- a/src/OpenIPC.Viewer.Desktop/Program.cs
+++ b/src/OpenIPC.Viewer.Desktop/Program.cs
@@ -24,6 +24,7 @@ public static int Main(string[] args)
             "Starting OpenIPC.Viewer {Version}",
             typeof(Program).Assembly.GetName().Version);
 
+        int exitCode;
         try
         {
             // Migrations + event ingestion no longer block here (they used to run
@@ -31,7 +32,7 @@ public static int Main(string[] args)
             // showed a frozen, window-less process). The startup splash window now
             // runs them off the UI thread with visible progress — see
             // App.OnFrameworkInitializationCompleted / StartupViewModel.
-            return BuildAvaloniaApp()
+            exitCode = BuildAvaloniaApp()
                 .StartWithClassicDesktopLifetime(args);
         }
         catch (Exception ex)
@@ -62,6 +63,13 @@ public static int Main(string[] args)
                 logger.LogWarning("Service disposal timed out during shutdown; forcing exit");
             }
         }
+
+        // Returning from Main is not enough: any foreground thread left behind by
+        // a native interop layer keeps the closed app alive in Task Manager
+        // (observed on Windows 10). Everything is flushed and disposed by now, so
+        // terminate unconditionally.
+        Environment.Exit(exitCode);
+        return exitCode; // unreachable — Environment.Exit does not return
     }
 
     private static AppBuilder BuildAvaloniaApp() =>

From 8c18310a0e72def5bcbca1073ac0e6e8f5efae56 Mon Sep 17 00:00:00 2001
From: keyldev <wudgexyz@gmail.com>
Date: Thu, 2 Jul 2026 19:21:15 +0300
Subject: [PATCH 2/7] feat(grid): keep a 4px inset in kiosk fullscreen

- full-bleed grid pressed against the physical screen edges
- mobile fullscreen video stays edge-to-edge
---
 src/OpenIPC.Viewer.App/Views/MainView.axaml.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/OpenIPC.Viewer.App/Views/MainView.axaml.cs b/src/OpenIPC.Viewer.App/Views/MainView.axaml.cs
index 7d3cf58..234645e 100644
--- a/src/OpenIPC.Viewer.App/Views/MainView.axaml.cs
+++ b/src/OpenIPC.Viewer.App/Views/MainView.axaml.cs
@@ -36,6 +36,9 @@ public partial class MainView : UserControl
 
     private static readonly Thickness WidePadding = new(24);
     private static readonly Thickness NarrowPadding = new(12);
+    // Desktop kiosk keeps a hairline inset so the grid doesn't press against
+    // the physical screen edges; mobile fullscreen video stays full-bleed.
+    private static readonly Thickness KioskPadding = new(4);
 
     private bool _isWideLayout = true;
     private bool _isFullscreen;
@@ -161,7 +164,8 @@ private void UpdateChrome()
     {
         var showSidebar = _isWideLayout && !_isFullscreen;
         var showBottomNav = !_isWideLayout && !_isFullscreen;
-        var padding = _isFullscreen ? new Thickness(0)
+        var padding = _isFullscreen
+            ? (_vm?.KioskMode == true ? KioskPadding : new Thickness(0))
             : _isWideLayout ? WidePadding : NarrowPadding;
 
         SetAndRaise(ShowSidebarProperty, ref _showSidebar, showSidebar);

From 9f8e2c23e6c4887cfff40c5261c7f9e4ad601a73 Mon Sep 17 00:00:00 2001
From: keyldev <wudgexyz@gmail.com>
Date: Thu, 2 Jul 2026 19:21:31 +0300
Subject: [PATCH 3/7] feat(editor): XM (Xiongmai) RTSP URI preset

- one-click fill of NETSurveillance-style main/sub RTSP URLs
- uses the credential fields, falls back to stock admin/empty
- localizer strings for this branch (incl. upcoming tray items)
---
 src/OpenIPC.Viewer.App/Services/Localizer.cs     | 16 ++++++++++++++++
 .../ViewModels/Dialogs/CameraEditorViewModel.cs  | 13 +++++++++++++
 .../Views/Dialogs/CameraEditorContent.axaml      | 10 +++++++++-
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/src/OpenIPC.Viewer.App/Services/Localizer.cs b/src/OpenIPC.Viewer.App/Services/Localizer.cs
index 2836175..e4d8d5b 100644
--- a/src/OpenIPC.Viewer.App/Services/Localizer.cs
+++ b/src/OpenIPC.Viewer.App/Services/Localizer.cs
@@ -76,6 +76,11 @@ private static LangCode DetectSystem()
         ["Startup.Failed"] = "Initialization failed",
         ["Startup.Retry"] = "Retry",
         ["Startup.Exit"] = "Exit",
+        ["Tray.Open"] = "Open viewer",
+        ["Tray.AddCamera"] = "Add camera…",
+        ["Tray.Settings"] = "Settings",
+        ["Tray.About"] = "About",
+        ["Tray.Exit"] = "Exit",
         ["Analytics.Overview"] = "Engine",
         ["Analytics.Status"] = "Status",
         ["Analytics.Status.NotStarted"] = "Not started",
@@ -212,6 +217,7 @@ private static LangCode DetectSystem()
         ["Settings.Appearance"] = "Appearance",
         ["Settings.Appearance.Language"] = "Language",
         ["Settings.Appearance.ShowSplash"] = "Show animated splash screen on launch",
+        ["Settings.Appearance.CloseToTray"] = "Keep running in the tray when the window is closed",
         ["Settings.Video"] = "Video",
         ["Settings.Recording"] = "Recording",
         ["Settings.Discovery"] = "Discovery",
@@ -334,6 +340,8 @@ private static LangCode DetectSystem()
         ["CameraEditor.Placeholder.SshPort"] = "22",
         ["CameraEditor.NoGroup"] = "(no group)",
         ["CameraEditor.Button.AutoDeriveRtsp"] = "Auto from host",
+        ["CameraEditor.Button.AutoDeriveXmRtsp"] = "XM preset",
+        ["CameraEditor.Tooltip.AutoDeriveXmRtsp"] = "Fill in the RTSP URLs used by XM/Xiongmai (NETSurveillance) cameras",
         ["CameraEditor.Button.TestConnection"] = "Test connection",
         ["CameraEditor.Status.Connecting"] = "Connecting…",
         ["CameraEditor.Status.OkFormat"] = "OK — {0}x{1}",
@@ -539,6 +547,11 @@ private static LangCode DetectSystem()
         ["Startup.Failed"] = "Ошибка инициализации",
         ["Startup.Retry"] = "Повторить",
         ["Startup.Exit"] = "Выход",
+        ["Tray.Open"] = "Открыть",
+        ["Tray.AddCamera"] = "Добавить камеру…",
+        ["Tray.Settings"] = "Настройки",
+        ["Tray.About"] = "О программе",
+        ["Tray.Exit"] = "Выход",
         ["Analytics.Overview"] = "Движок",
         ["Analytics.Status"] = "Статус",
         ["Analytics.Status.NotStarted"] = "Не запущен",
@@ -675,6 +688,7 @@ private static LangCode DetectSystem()
         ["Settings.Appearance"] = "Внешний вид",
         ["Settings.Appearance.Language"] = "Язык",
         ["Settings.Appearance.ShowSplash"] = "Показывать анимированную заставку при запуске",
+        ["Settings.Appearance.CloseToTray"] = "При закрытии окна оставаться в трее",
         ["Settings.Video"] = "Видео",
         ["Settings.Recording"] = "Запись",
         ["Settings.Discovery"] = "Поиск",
@@ -797,6 +811,8 @@ private static LangCode DetectSystem()
         ["CameraEditor.Placeholder.SshPort"] = "22",
         ["CameraEditor.NoGroup"] = "(без группы)",
         ["CameraEditor.Button.AutoDeriveRtsp"] = "Подставить из хоста",
+        ["CameraEditor.Button.AutoDeriveXmRtsp"] = "Пресет XM",
+        ["CameraEditor.Tooltip.AutoDeriveXmRtsp"] = "Подставить RTSP-адреса камер XM/Xiongmai (NETSurveillance)",
         ["CameraEditor.Button.TestConnection"] = "Проверить",
         ["CameraEditor.Status.Connecting"] = "Подключение…",
         ["CameraEditor.Status.OkFormat"] = "OK — {0}x{1}",
diff --git a/src/OpenIPC.Viewer.App/ViewModels/Dialogs/CameraEditorViewModel.cs b/src/OpenIPC.Viewer.App/ViewModels/Dialogs/CameraEditorViewModel.cs
index 5403ce2..8dde719 100644
--- a/src/OpenIPC.Viewer.App/ViewModels/Dialogs/CameraEditorViewModel.cs
+++ b/src/OpenIPC.Viewer.App/ViewModels/Dialogs/CameraEditorViewModel.cs
@@ -159,6 +159,19 @@ private void AutoDeriveRtsp()
             RtspMainText = $"rtsp://{Host.Trim()}/";
     }
 
+    // XM/Xiongmai (NETSurveillance) firmware embeds the login in the RTSP path
+    // and serves main/sub as stream=0/1. Uses the credential fields when set,
+    // falling back to the stock "admin" + empty password those cameras ship with.
+    [RelayCommand]
+    private void AutoDeriveXmRtsp()
+    {
+        if (string.IsNullOrWhiteSpace(Host)) return;
+        var host = Host.Trim();
+        var user = string.IsNullOrWhiteSpace(Username) ? "admin" : Username.Trim();
+        RtspMainText = $"rtsp://{host}:554/user={user}&password={Password}&channel=1&stream=0.sdp?real_stream";
+        RtspSubText = $"rtsp://{host}:554/user={user}&password={Password}&channel=1&stream=1.sdp?real_stream";
+    }
+
     [RelayCommand(CanExecute = nameof(CanTestConnection))]
     private async Task TestConnectionAsync()
     {
diff --git a/src/OpenIPC.Viewer.App/Views/Dialogs/CameraEditorContent.axaml b/src/OpenIPC.Viewer.App/Views/Dialogs/CameraEditorContent.axaml
index 45abd41..f6c02c0 100644
--- a/src/OpenIPC.Viewer.App/Views/Dialogs/CameraEditorContent.axaml
+++ b/src/OpenIPC.Viewer.App/Views/Dialogs/CameraEditorContent.axaml
@@ -43,7 +43,7 @@
         </StackPanel>
 
         <StackPanel Spacing="6">
-          <Grid ColumnDefinitions="*,Auto">
+          <Grid ColumnDefinitions="*,Auto,12,Auto">
             <TextBlock Grid.Column="0" Text="{Binding [CameraEditor.Label.RtspMain], Source={x:Static svc:Localizer.Instance}}" Foreground="{StaticResource TextSecondaryBrush}" FontSize="{StaticResource FontSizeSm}" />
             <Button Grid.Column="1"
                     Content="{Binding [CameraEditor.Button.AutoDeriveRtsp], Source={x:Static svc:Localizer.Instance}}"
@@ -52,6 +52,14 @@
                     Foreground="{StaticResource AccentBrush}"
                     Padding="0"
                     FontSize="{StaticResource FontSizeSm}" />
+            <Button Grid.Column="3"
+                    Content="{Binding [CameraEditor.Button.AutoDeriveXmRtsp], Source={x:Static svc:Localizer.Instance}}"
+                    Command="{Binding AutoDeriveXmRtspCommand}"
+                    ToolTip.Tip="{Binding [CameraEditor.Tooltip.AutoDeriveXmRtsp], Source={x:Static svc:Localizer.Instance}}"
+                    Background="Transparent"
+                    Foreground="{StaticResource AccentBrush}"
+                    Padding="0"
+                    FontSize="{StaticResource FontSizeSm}" />
           </Grid>
           <TextBox Text="{Binding RtspMainText, Mode=TwoWay}" PlaceholderText="{Binding [CameraEditor.Placeholder.RtspMain], Source={x:Static svc:Localizer.Instance}}" FontFamily="{StaticResource FontMono}" />
         </StackPanel>

From 22ad9223080f77540aa89af7e0f298b048ccd7dc Mon Sep 17 00:00:00 2001
From: keyldev <wudgexyz@gmail.com>
Date: Thu, 2 Jul 2026 19:21:42 +0300
Subject: [PATCH 4/7] feat(desktop): tray icon + close-to-tray setting

- tray menu: open, add camera, settings, about, exit
- optional close-to-tray (off by default); hidden window releases live streams
- restore un-minimizes to the pre-minimize state and activates the window
---
 src/OpenIPC.Viewer.App/App.axaml.cs           |  30 +++++
 .../Services/TrayIconService.cs               | 121 ++++++++++++++++++
 .../Services/UserSettings.cs                  |   5 +-
 .../ViewModels/SettingsPageViewModel.cs       |  12 ++
 .../Views/MainWindow.axaml.cs                 |  48 +++++++
 .../Views/Pages/SettingsPage.axaml            |   6 +
 6 files changed, 221 insertions(+), 1 deletion(-)
 create mode 100644 src/OpenIPC.Viewer.App/Services/TrayIconService.cs

diff --git a/src/OpenIPC.Viewer.App/App.axaml.cs b/src/OpenIPC.Viewer.App/App.axaml.cs
index 44ab1d0..7ef0524 100644
--- a/src/OpenIPC.Viewer.App/App.axaml.cs
+++ b/src/OpenIPC.Viewer.App/App.axaml.cs
@@ -5,6 +5,7 @@
 using Avalonia.Markup.Xaml;
 using Avalonia.Threading;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using OpenIPC.Viewer.App.Services;
 using OpenIPC.Viewer.App.ViewModels;
 using OpenIPC.Viewer.App.Views;
@@ -19,6 +20,10 @@ public sealed class App : Application
     // AvaloniaMainActivity<App> requires on Android.
     public static IServiceProvider? Services { get; set; }
 
+    // Desktop tray icon (null on mobile and until the main window first opens).
+    // MainWindow consults ExitRequested to tell a tray "Exit" from a close.
+    public static TrayIconService? Tray { get; private set; }
+
     // How long the mobile splash overlay stays before fading. The Android boot
     // is fast, so without a minimum beat the splash would just flicker.
     private static readonly TimeSpan MobileSplashMinDuration = TimeSpan.FromSeconds(1.6);
@@ -83,6 +88,31 @@ private static void ShowMainWindow(IClassicDesktopStyleApplicationLifetime deskt
         desktop.MainWindow = main;
         main.Show();
         toClose?.Close();
+        ShowTrayIcon(desktop);
+    }
+
+    // Best-effort: some Linux desktops have no tray support, and a missing tray
+    // must never take the app down with it.
+    private static void ShowTrayIcon(IClassicDesktopStyleApplicationLifetime desktop)
+    {
+        if (Tray is not null)
+            return;
+        try
+        {
+            Tray = new TrayIconService(desktop, Services!);
+            Tray.Show();
+            desktop.Exit += (_, _) =>
+            {
+                Tray?.Dispose();
+                Tray = null;
+            };
+        }
+        catch (Exception ex)
+        {
+            Services!.GetService<ILoggerFactory>()?.CreateLogger(nameof(App))
+                .LogWarning(ex, "Tray icon unavailable on this platform");
+            Tray = null;
+        }
     }
 
     // Android/iOS: migrations already ran in the platform host, so the splash is
diff --git a/src/OpenIPC.Viewer.App/Services/TrayIconService.cs b/src/OpenIPC.Viewer.App/Services/TrayIconService.cs
new file mode 100644
index 0000000..fa2f026
--- /dev/null
+++ b/src/OpenIPC.Viewer.App/Services/TrayIconService.cs
@@ -0,0 +1,121 @@
+using System;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Platform;
+using Microsoft.Extensions.DependencyInjection;
+using OpenIPC.Viewer.App.ViewModels;
+
+namespace OpenIPC.Viewer.App.Services;
+
+// Desktop tray icon. Created by App once the main window is up and lives until
+// process exit. Owns the close-to-tray flow: with the setting on, MainWindow
+// cancels its close and hides itself, and this menu is the way back (or out).
+public sealed class TrayIconService : IDisposable
+{
+    private readonly IClassicDesktopStyleApplicationLifetime _desktop;
+    private readonly IServiceProvider _services;
+    private TrayIcon? _tray;
+
+    // Set by the tray "Exit" item so MainWindow.OnClosing lets the close
+    // proceed even when close-to-tray is enabled.
+    public bool ExitRequested { get; private set; }
+
+    public TrayIconService(IClassicDesktopStyleApplicationLifetime desktop, IServiceProvider services)
+    {
+        _desktop = desktop;
+        _services = services;
+    }
+
+    public void Show()
+    {
+        if (_tray is not null)
+            return;
+
+        _tray = new TrayIcon
+        {
+            Icon = new WindowIcon(AssetLoader.Open(
+                new Uri("avares://OpenIPC.Viewer.App/Assets/openipc-logo.png"))),
+            ToolTipText = "OpenIPC Viewer",
+            Menu = BuildMenu(),
+        };
+        _tray.Clicked += OnTrayClicked;
+        TrayIcon.SetIcons(Application.Current!, new TrayIcons { _tray });
+
+        // Menu item text follows the in-app language switch.
+        Localizer.Instance.PropertyChanged += OnLanguageChanged;
+    }
+
+    private void OnTrayClicked(object? sender, EventArgs e) => RestoreMainWindow();
+
+    private void OnLanguageChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+    {
+        if (_tray is not null)
+            _tray.Menu = BuildMenu();
+    }
+
+    private NativeMenu BuildMenu()
+    {
+        var menu = new NativeMenu();
+        menu.Add(Item("Tray.Open", RestoreMainWindow));
+        menu.Add(Item("Tray.AddCamera", AddCamera));
+        menu.Add(new NativeMenuItemSeparator());
+        // About lives on the settings page, so both items land there — About
+        // just deep-links to its section.
+        menu.Add(Item("Tray.Settings", () => OpenSettings(about: false)));
+        menu.Add(Item("Tray.About", () => OpenSettings(about: true)));
+        menu.Add(new NativeMenuItemSeparator());
+        menu.Add(Item("Tray.Exit", ExitApplication));
+        return menu;
+    }
+
+    private static NativeMenuItem Item(string key, Action action)
+    {
+        var item = new NativeMenuItem(Localizer.Instance[key]);
+        item.Click += (_, _) => action();
+        return item;
+    }
+
+    private void RestoreMainWindow()
+    {
+        if (_desktop.MainWindow is Views.MainWindow window)
+            window.RestoreFromTray();
+    }
+
+    private void AddCamera()
+    {
+        RestoreMainWindow();
+        var vm = _services.GetService<MainWindowViewModel>();
+        if (vm is null) return;
+        vm.NavigateCommand.Execute("library");
+        vm.Library.AddCameraCommand.Execute(null);
+    }
+
+    private void OpenSettings(bool about)
+    {
+        RestoreMainWindow();
+        var vm = _services.GetService<MainWindowViewModel>();
+        if (vm is null) return;
+        vm.NavigateCommand.Execute("settings");
+        if (about)
+            vm.Settings.SelectAboutSection();
+    }
+
+    private void ExitApplication()
+    {
+        ExitRequested = true;
+        _desktop.Shutdown();
+    }
+
+    public void Dispose()
+    {
+        Localizer.Instance.PropertyChanged -= OnLanguageChanged;
+        if (_tray is null)
+            return;
+        // Explicit disposal removes the icon immediately — relying on process
+        // death leaves a ghost icon in the Windows tray until hovered.
+        _tray.Clicked -= OnTrayClicked;
+        _tray.Dispose();
+        _tray = null;
+    }
+}
diff --git a/src/OpenIPC.Viewer.App/Services/UserSettings.cs b/src/OpenIPC.Viewer.App/Services/UserSettings.cs
index ee029c3..9320bf7 100644
--- a/src/OpenIPC.Viewer.App/Services/UserSettings.cs
+++ b/src/OpenIPC.Viewer.App/Services/UserSettings.cs
@@ -91,7 +91,10 @@ public sealed record UserSettings(
     // session in every grid tile — far cheaper on CPU/bandwidth for big walls.
     // Interval is seconds between grabs. A per-camera override lands later.
     bool GridStillsMode = false,
-    int GridStillsIntervalSeconds = 10)
+    int GridStillsIntervalSeconds = 10,
+    // Desktop only: closing the main window hides it to the tray icon instead
+    // of quitting (live streams are released while hidden). Off = close quits.
+    bool CloseToTray = false)
 {
     public static UserSettings Default => new();
 }
diff --git a/src/OpenIPC.Viewer.App/ViewModels/SettingsPageViewModel.cs b/src/OpenIPC.Viewer.App/ViewModels/SettingsPageViewModel.cs
index 97a87d5..2e2ec98 100644
--- a/src/OpenIPC.Viewer.App/ViewModels/SettingsPageViewModel.cs
+++ b/src/OpenIPC.Viewer.App/ViewModels/SettingsPageViewModel.cs
@@ -45,6 +45,11 @@ public sealed partial class SettingsPageViewModel : ViewModelBase
     [ObservableProperty] private NetworkInterfaceOption? _selectedNetworkInterface;
     [ObservableProperty] private string _language = "system";
     [ObservableProperty] private bool _showSplash = true;
+    [ObservableProperty] private bool _closeToTray;
+
+    // Gates the desktop-only toggles (tray) off the shared settings page.
+    public bool IsDesktopPlatform { get; } =
+        !OperatingSystem.IsAndroid() && !OperatingSystem.IsIOS();
 
     // SSH section (Phase 13).
     [ObservableProperty] private bool _sshStrictHostKey = true;
@@ -116,6 +121,10 @@ partial void OnIsWideChanged(bool value)
     [RelayCommand]
     private void BackToList() => SelectedSectionIndex = -1;
 
+    // Deep-link target for the tray "About" item — keeps the section index in
+    // one place (it shifts between editions with different section sets).
+    public void SelectAboutSection() => SelectedSectionIndex = 6;
+
     public bool IsRecordingsDirOverridden => !string.IsNullOrWhiteSpace(RecordingsDirOverride);
 
     // What RecordingService will actually use — override if set, otherwise
@@ -206,6 +215,7 @@ private void Load()
             RecordingsDirOverride = s.RecordingsDirOverride;
             Language = s.Language;
             ShowSplash = s.ShowSplash;
+            CloseToTray = s.CloseToTray;
             SshStrictHostKey = s.SshStrictHostKey;
             SshDefaultPort = s.SshDefaultPort;
             SshTerminalFontSize = s.SshTerminalFontSize;
@@ -237,6 +247,7 @@ private void Load()
     partial void OnRecordingsDirOverrideChanged(string value) => Persist();
     partial void OnLanguageChanged(string value) => Persist();
     partial void OnShowSplashChanged(bool value) => Persist();
+    partial void OnCloseToTrayChanged(bool value) => Persist();
     partial void OnSshStrictHostKeyChanged(bool value) => Persist();
     partial void OnSshDefaultPortChanged(int value) => Persist();
     partial void OnSshTerminalFontSizeChanged(int value) => Persist();
@@ -267,6 +278,7 @@ private void Persist()
             RecordingsDirOverride = RecordingsDirOverride,
             Language = Language,
             ShowSplash = ShowSplash,
+            CloseToTray = CloseToTray,
             SshStrictHostKey = SshStrictHostKey,
             SshDefaultPort = SshDefaultPort,
             SshTerminalFontSize = SshTerminalFontSize,
diff --git a/src/OpenIPC.Viewer.App/Views/MainWindow.axaml.cs b/src/OpenIPC.Viewer.App/Views/MainWindow.axaml.cs
index 7ff842e..37a44c6 100644
--- a/src/OpenIPC.Viewer.App/Views/MainWindow.axaml.cs
+++ b/src/OpenIPC.Viewer.App/Views/MainWindow.axaml.cs
@@ -14,12 +14,17 @@ public sealed partial class MainWindow : Window
     private readonly UserSettingsService? _settings;
     private readonly IdleStreamMonitor? _idle;
     private WindowState _previousState = WindowState.Normal;
+    // State to restore when un-minimizing from the tray (Normal or Maximized) —
+    // _previousState itself becomes Minimized right after the transition.
+    private WindowState _preMinimizeState = WindowState.Normal;
 
     // Last known normal-state geometry, tracked live so a window that closes
     // while maximized still persists sensible un-maximize bounds.
     private PixelPoint _normalPosition;
     private Size _normalSize;
 
+    private bool _hiddenToTray;
+
     public MainWindow()
     {
         InitializeComponent();
@@ -129,6 +134,48 @@ private void OnClosing(object? sender, WindowClosingEventArgs e)
         // Synchronous so the write completes before the process exits; the save
         // is off-UI file IO (ConfigureAwait(false)) so this won't deadlock.
         _settings.UpdateAsync(next).GetAwaiter().GetResult();
+
+        // Close-to-tray: a user-initiated close hides the window instead of
+        // quitting. Tray "Exit" and app/OS shutdown pass through — geometry was
+        // already persisted above either way.
+        if (_settings.Current.CloseToTray &&
+            e.CloseReason == WindowCloseReason.WindowClosing &&
+            App.Tray is { ExitRequested: false })
+        {
+            e.Cancel = true;
+            HideToTray();
+        }
+    }
+
+    // Hidden windows keep their live RTSP sessions unless told otherwise, so
+    // hiding reuses the minimize path: streams are released while nobody looks.
+    private void HideToTray()
+    {
+        if (_hiddenToTray) return;
+        _hiddenToTray = true;
+        Hide();
+        _idle?.SetMinimized(true);
+        WeakReferenceMessenger.Default.Send(new WindowMinimizedMessage());
+    }
+
+    // Entry point for the tray icon (click or menu): un-hide, un-minimize and
+    // bring the window to the foreground.
+    public void RestoreFromTray()
+    {
+        if (_hiddenToTray)
+        {
+            _hiddenToTray = false;
+            Show();
+            _idle?.SetMinimized(false);
+            WeakReferenceMessenger.Default.Send(new WindowRestoredMessage());
+        }
+
+        if (WindowState == WindowState.Minimized)
+            WindowState = _preMinimizeState == WindowState.Maximized
+                ? WindowState.Maximized
+                : WindowState.Normal;
+
+        Activate();
     }
 
     private void OnWindowPropertyChanged(object? sender, Avalonia.AvaloniaPropertyChangedEventArgs e)
@@ -139,6 +186,7 @@ private void OnWindowPropertyChanged(object? sender, Avalonia.AvaloniaPropertyCh
         var current = (WindowState)e.NewValue!;
         if (current == WindowState.Minimized && _previousState != WindowState.Minimized)
         {
+            _preMinimizeState = _previousState;
             _idle?.SetMinimized(true);
             WeakReferenceMessenger.Default.Send(new WindowMinimizedMessage());
         }
diff --git a/src/OpenIPC.Viewer.App/Views/Pages/SettingsPage.axaml b/src/OpenIPC.Viewer.App/Views/Pages/SettingsPage.axaml
index db74da9..6de5509 100644
--- a/src/OpenIPC.Viewer.App/Views/Pages/SettingsPage.axaml
+++ b/src/OpenIPC.Viewer.App/Views/Pages/SettingsPage.axaml
@@ -235,6 +235,12 @@
           <CheckBox IsChecked="{Binding ShowSplash}"
                     Content="{Binding [Settings.Appearance.ShowSplash], Source={x:Static svc:Localizer.Instance}}"
                     Foreground="{StaticResource TextPrimaryBrush}" />
+
+          <!-- Desktop only: mobile has no tray. -->
+          <CheckBox IsChecked="{Binding CloseToTray}"
+                    IsVisible="{Binding IsDesktopPlatform}"
+                    Content="{Binding [Settings.Appearance.CloseToTray], Source={x:Static svc:Localizer.Instance}}"
+                    Foreground="{StaticResource TextPrimaryBrush}" />
         </StackPanel>
 
         <!-- Video -->

From 4faa1d544122157801a0f98d723df9cf767103ce Mon Sep 17 00:00:00 2001
From: keyldev <wudgexyz@gmail.com>
Date: Thu, 2 Jul 2026 19:53:19 +0300
Subject: [PATCH 5/7] fix(desktop): deadlock + stuck window on close-to-tray

- settings SaveAsync: bare `await using` captured the dispatcher; a blocking
  wait in OnClosing then deadlocked the UI thread (frozen app)
- hide-to-tray no longer blocks on the save at all; Hide() is posted after
  the close dispatch (inline Hide is silently dropped by Avalonia)
- real close keeps a bounded 5s wait so the write lands before forced exit
---
 .../Services/UserSettingsService.cs           |  8 ++++-
 .../Views/MainWindow.axaml.cs                 | 33 ++++++++++++++-----
 2 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/src/OpenIPC.Viewer.App/Services/UserSettingsService.cs b/src/OpenIPC.Viewer.App/Services/UserSettingsService.cs
index d2cd8ce..cb58e8d 100644
--- a/src/OpenIPC.Viewer.App/Services/UserSettingsService.cs
+++ b/src/OpenIPC.Viewer.App/Services/UserSettingsService.cs
@@ -95,7 +95,13 @@ private void TryLoad()
     private async Task SaveAsync(CancellationToken ct)
     {
         var tmp = _path + ".tmp";
-        await using (var stream = File.Create(tmp))
+        var stream = File.Create(tmp);
+        // A bare `await using` has no ConfigureAwait — when this method is
+        // entered on the UI thread (free-gate UpdateAsync runs synchronously up
+        // to here), the DisposeAsync continuation would be posted back to the
+        // blocked dispatcher and deadlock a caller that synchronously waits on
+        // the task (MainWindow.OnClosing did exactly that).
+        await using (stream.ConfigureAwait(false))
             await JsonSerializer.SerializeAsync(stream, Current, JsonOpts, ct).ConfigureAwait(false);
         File.Move(tmp, _path, overwrite: true);
     }
diff --git a/src/OpenIPC.Viewer.App/Views/MainWindow.axaml.cs b/src/OpenIPC.Viewer.App/Views/MainWindow.axaml.cs
index 37a44c6..52f45a2 100644
--- a/src/OpenIPC.Viewer.App/Views/MainWindow.axaml.cs
+++ b/src/OpenIPC.Viewer.App/Views/MainWindow.axaml.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Threading;
 using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.Extensions.DependencyInjection;
 using OpenIPC.Viewer.App.Messages;
@@ -131,19 +132,35 @@ private void OnClosing(object? sender, WindowClosingEventArgs e)
             WindowMaximized = maximized,
         };
 
-        // Synchronous so the write completes before the process exits; the save
-        // is off-UI file IO (ConfigureAwait(false)) so this won't deadlock.
-        _settings.UpdateAsync(next).GetAwaiter().GetResult();
-
-        // Close-to-tray: a user-initiated close hides the window instead of
-        // quitting. Tray "Exit" and app/OS shutdown pass through — geometry was
-        // already persisted above either way.
+        // Close-to-tray: hide instead of quitting. Tray "Exit" and app/OS
+        // shutdown pass through. Two hard-won rules for this branch:
+        //  - never block on the save here — the process stays alive, so the
+        //    write can finish in the background;
+        //  - never call Hide() inside this handler — Avalonia drops visibility
+        //    changes while a close is being processed, leaving the window in a
+        //    stuck state where every further close is a no-op. Post it instead.
         if (_settings.Current.CloseToTray &&
             e.CloseReason == WindowCloseReason.WindowClosing &&
             App.Tray is { ExitRequested: false })
         {
             e.Cancel = true;
-            HideToTray();
+            _ = _settings.UpdateAsync(next);
+            Dispatcher.UIThread.Post(HideToTray);
+            return;
+        }
+
+        // Real exit: the write must land before Program.Main force-exits the
+        // process. The save completes entirely off the UI thread (SaveAsync is
+        // ConfigureAwait(false) throughout — including the stream disposal,
+        // which once captured the dispatcher and deadlocked this very wait);
+        // the timeout is a backstop so a wedged save can never freeze the close.
+        try
+        {
+            _settings.UpdateAsync(next).Wait(TimeSpan.FromSeconds(5));
+        }
+        catch (AggregateException)
+        {
+            // A failed save must not block exiting.
         }
     }
 

From 75d93cc9896c93e6280bea15f555f61185d04ead Mon Sep 17 00:00:00 2001
From: keyldev <wudgexyz@gmail.com>
Date: Thu, 2 Jul 2026 20:05:52 +0300
Subject: [PATCH 6/7] feat(tray): icons on menu items

- lucide geometries rendered to 2x bitmaps (NativeMenuItem has no vector slot)
- accent-colored stroke, cached across language-switch menu rebuilds
- new IconCog + IconPower geometries in Theme.axaml
---
 .../Services/TrayIconService.cs               | 79 +++++++++++++++++--
 src/OpenIPC.Viewer.App/Themes/Theme.axaml     |  4 +
 2 files changed, 76 insertions(+), 7 deletions(-)

diff --git a/src/OpenIPC.Viewer.App/Services/TrayIconService.cs b/src/OpenIPC.Viewer.App/Services/TrayIconService.cs
index fa2f026..4b97c7e 100644
--- a/src/OpenIPC.Viewer.App/Services/TrayIconService.cs
+++ b/src/OpenIPC.Viewer.App/Services/TrayIconService.cs
@@ -1,7 +1,10 @@
 using System;
+using System.Collections.Generic;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Media;
+using Avalonia.Media.Imaging;
 using Avalonia.Platform;
 using Microsoft.Extensions.DependencyInjection;
 using OpenIPC.Viewer.App.ViewModels;
@@ -57,25 +60,84 @@ private void OnLanguageChanged(object? sender, System.ComponentModel.PropertyCha
     private NativeMenu BuildMenu()
     {
         var menu = new NativeMenu();
-        menu.Add(Item("Tray.Open", RestoreMainWindow));
-        menu.Add(Item("Tray.AddCamera", AddCamera));
+        menu.Add(Item("Tray.Open", "IconVideo", RestoreMainWindow));
+        menu.Add(Item("Tray.AddCamera", "IconCamera", AddCamera));
         menu.Add(new NativeMenuItemSeparator());
         // About lives on the settings page, so both items land there — About
         // just deep-links to its section.
-        menu.Add(Item("Tray.Settings", () => OpenSettings(about: false)));
-        menu.Add(Item("Tray.About", () => OpenSettings(about: true)));
+        menu.Add(Item("Tray.Settings", "IconCog", () => OpenSettings(about: false)));
+        menu.Add(Item("Tray.About", "IconAbout", () => OpenSettings(about: true)));
         menu.Add(new NativeMenuItemSeparator());
-        menu.Add(Item("Tray.Exit", ExitApplication));
+        menu.Add(Item("Tray.Exit", "IconPower", ExitApplication));
         return menu;
     }
 
-    private static NativeMenuItem Item(string key, Action action)
+    private NativeMenuItem Item(string key, string iconKey, Action action)
     {
-        var item = new NativeMenuItem(Localizer.Instance[key]);
+        var item = new NativeMenuItem(Localizer.Instance[key])
+        {
+            Icon = GetMenuIcon(iconKey),
+        };
         item.Click += (_, _) => action();
         return item;
     }
 
+    // Rendered lucide bitmaps, one per geometry key. Cached because the menu is
+    // rebuilt on every language switch and the icons never change.
+    private readonly Dictionary<string, Bitmap?> _menuIcons = new();
+
+    // Renders one of the Theme.axaml lucide stroke geometries into a small
+    // bitmap for NativeMenuItem.Icon (there is no vector slot on native menu
+    // items). Mirrors the Path.lucide style; 2x pixel density keeps the ~16px
+    // menu glyph crisp on scaled displays. Best-effort: a missing resource or
+    // render failure just leaves the item without an icon.
+    private Bitmap? GetMenuIcon(string resourceKey)
+    {
+        if (_menuIcons.TryGetValue(resourceKey, out var cached))
+            return cached;
+
+        Bitmap? bitmap = null;
+        try
+        {
+            if (Application.Current?.TryGetResource(resourceKey, null, out var res) == true &&
+                res is Geometry geometry)
+            {
+                var accent = Application.Current.TryGetResource("AccentBrush", null, out var b) && b is IBrush brush
+                    ? brush
+                    : Brushes.Gray;
+
+                var path = new Avalonia.Controls.Shapes.Path
+                {
+                    Data = geometry,
+                    Stroke = accent,
+                    StrokeThickness = 1.5,
+                    StrokeLineCap = PenLineCap.Round,
+                    StrokeJoin = PenLineJoin.Round,
+                    Fill = Brushes.Transparent,
+                    Stretch = Stretch.Uniform,
+                    Width = 16,
+                    Height = 16,
+                    HorizontalAlignment = Avalonia.Layout.HorizontalAlignment.Center,
+                    VerticalAlignment = Avalonia.Layout.VerticalAlignment.Center,
+                };
+                var host = new Border { Width = 20, Height = 20, Child = path };
+                host.Measure(new Size(20, 20));
+                host.Arrange(new Rect(0, 0, 20, 20));
+
+                var rtb = new RenderTargetBitmap(new PixelSize(40, 40), new Vector(192, 192));
+                rtb.Render(host);
+                bitmap = rtb;
+            }
+        }
+        catch
+        {
+            bitmap = null;
+        }
+
+        _menuIcons[resourceKey] = bitmap;
+        return bitmap;
+    }
+
     private void RestoreMainWindow()
     {
         if (_desktop.MainWindow is Views.MainWindow window)
@@ -110,6 +172,9 @@ private void ExitApplication()
     public void Dispose()
     {
         Localizer.Instance.PropertyChanged -= OnLanguageChanged;
+        foreach (var icon in _menuIcons.Values)
+            icon?.Dispose();
+        _menuIcons.Clear();
         if (_tray is null)
             return;
         // Explicit disposal removes the icon immediately — relying on process
diff --git a/src/OpenIPC.Viewer.App/Themes/Theme.axaml b/src/OpenIPC.Viewer.App/Themes/Theme.axaml
index c57fb9e..96eb7e7 100644
--- a/src/OpenIPC.Viewer.App/Themes/Theme.axaml
+++ b/src/OpenIPC.Viewer.App/Themes/Theme.axaml
@@ -98,5 +98,9 @@
   <StreamGeometry x:Key="IconVolumeMuted">M11,5 L6,9 H2 V15 H6 L11,19 Z M23,9 L17,15 M17,9 L23,15</StreamGeometry>
   <!-- IconMic — Lucide "mic", push-to-talk (Phase 17.6). -->
   <StreamGeometry x:Key="IconMic">M12,2 A3,3 0 0 0 9,5 V11 A3,3 0 0 0 15,11 V5 A3,3 0 0 0 12,2 Z M19,10 V11 A7,7 0 0 1 5,11 V10 M12,18 V22 M8,22 H16</StreamGeometry>
+  <!-- IconCog — Lucide "settings" (gear), tray menu. -->
+  <StreamGeometry x:Key="IconCog">M12.22,2 h-0.44 a2,2 0 0 0 -2,2 v0.18 a2,2 0 0 1 -1,1.73 l-0.43,0.25 a2,2 0 0 1 -2,0 l-0.15,-0.08 a2,2 0 0 0 -2.73,0.73 l-0.22,0.38 a2,2 0 0 0 0.73,2.73 l0.15,0.1 a2,2 0 0 1 1,1.72 v0.51 a2,2 0 0 1 -1,1.74 l-0.15,0.09 a2,2 0 0 0 -0.73,2.73 l0.22,0.38 a2,2 0 0 0 2.73,0.73 l0.15,-0.08 a2,2 0 0 1 2,0 l0.43,0.25 a2,2 0 0 1 1,1.73 V20 a2,2 0 0 0 2,2 h0.44 a2,2 0 0 0 2,-2 v-0.18 a2,2 0 0 1 1,-1.73 l0.43,-0.25 a2,2 0 0 1 2,0 l0.15,0.08 a2,2 0 0 0 2.73,-0.73 l0.22,-0.39 a2,2 0 0 0 -0.73,-2.73 l-0.15,-0.08 a2,2 0 0 1 -1,-1.74 v-0.5 a2,2 0 0 1 1,-1.74 l0.15,-0.09 a2,2 0 0 0 0.73,-2.73 l-0.22,-0.38 a2,2 0 0 0 -2.73,-0.73 l-0.15,0.08 a2,2 0 0 1 -2,0 l-0.43,-0.25 a2,2 0 0 1 -1,-1.73 V4 a2,2 0 0 0 -2,-2 Z M9,12 A3,3 0 1 0 15,12 A3,3 0 1 0 9,12 Z</StreamGeometry>
+  <!-- IconPower — Lucide "power", tray menu exit. -->
+  <StreamGeometry x:Key="IconPower">M12,2 V12 M18.36,6.64 A9,9 0 1 1 5.63,6.64</StreamGeometry>
 
 </ResourceDictionary>

From a391f88f24dcb41cfa5261f54a37fc705230c7e3 Mon Sep 17 00:00:00 2001
From: keyldev <wudgexyz@gmail.com>
Date: Thu, 2 Jul 2026 20:20:55 +0300
Subject: [PATCH 7/7] fix(tray): menu icons rendered at 16px/96dpi

- menu shows the bitmap at pixel size; the 2x bitmap overflowed the icon
  slot and got cropped to its corner
---
 .../Services/TrayIconService.cs               | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/OpenIPC.Viewer.App/Services/TrayIconService.cs b/src/OpenIPC.Viewer.App/Services/TrayIconService.cs
index 4b97c7e..b54aac1 100644
--- a/src/OpenIPC.Viewer.App/Services/TrayIconService.cs
+++ b/src/OpenIPC.Viewer.App/Services/TrayIconService.cs
@@ -88,9 +88,11 @@ private NativeMenuItem Item(string key, string iconKey, Action action)
 
     // Renders one of the Theme.axaml lucide stroke geometries into a small
     // bitmap for NativeMenuItem.Icon (there is no vector slot on native menu
-    // items). Mirrors the Path.lucide style; 2x pixel density keeps the ~16px
-    // menu glyph crisp on scaled displays. Best-effort: a missing resource or
-    // render failure just leaves the item without an icon.
+    // items). Mirrors the Path.lucide style. The bitmap MUST be 16×16 at 96
+    // DPI: the menu presents it at pixel size, so a hi-DPI (2x) bitmap comes
+    // out double-sized and gets cropped to its top-left corner in the ~16px
+    // icon slot. Best-effort: a missing resource or render failure just
+    // leaves the item without an icon.
     private Bitmap? GetMenuIcon(string resourceKey)
     {
         if (_menuIcons.TryGetValue(resourceKey, out var cached))
@@ -115,16 +117,16 @@ private NativeMenuItem Item(string key, string iconKey, Action action)
                     StrokeJoin = PenLineJoin.Round,
                     Fill = Brushes.Transparent,
                     Stretch = Stretch.Uniform,
-                    Width = 16,
-                    Height = 16,
+                    Width = 14,
+                    Height = 14,
                     HorizontalAlignment = Avalonia.Layout.HorizontalAlignment.Center,
                     VerticalAlignment = Avalonia.Layout.VerticalAlignment.Center,
                 };
-                var host = new Border { Width = 20, Height = 20, Child = path };
-                host.Measure(new Size(20, 20));
-                host.Arrange(new Rect(0, 0, 20, 20));
+                var host = new Border { Width = 16, Height = 16, Child = path };
+                host.Measure(new Size(16, 16));
+                host.Arrange(new Rect(0, 0, 16, 16));
 
-                var rtb = new RenderTargetBitmap(new PixelSize(40, 40), new Vector(192, 192));
+                var rtb = new RenderTargetBitmap(new PixelSize(16, 16), new Vector(96, 96));
                 rtb.Render(host);
                 bitmap = rtb;
             }