GUI: hide-to-tray on X button; tray persists until explicit Exit
The minimize-to-tray behavior already worked, but clicking the X button killed the GUI process and took the tray with it. That made "tray when the GUI window is closed" a UX dead end - the only way to get the tray was to leave the window minimized. Now: - X button / Alt+F4 -> hide window, tray stays alive - Tray double-click -> reopens window - File -> Exit (or tray's Exit menu) -> truly quits the process Wired by adding a RealExitRequested event on MainViewModel that the window subscribes to (so File -> Exit sets the ExitForReal flag before calling Shutdown), and a parallel onExit callback on TrayIcon for the tray menu's Exit item. The Closing handler checks ExitForReal: if false (X / Alt+F4) it cancels the close and hides; if true, it disposes the tray and lets the close proceed. Auto-start at login is still TBD - if you want the tray to be there without manually launching the GUI after a reboot, that's a separate Task Scheduler entry. Skipping for now. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -1,3 +1,4 @@
|
|||||||
|
using System.ComponentModel;
|
||||||
using System.Windows;
|
using System.Windows;
|
||||||
using System.Windows.Controls;
|
using System.Windows.Controls;
|
||||||
using System.Windows.Input;
|
using System.Windows.Input;
|
||||||
@@ -11,19 +12,48 @@ public partial class MainWindow : Window
|
|||||||
private readonly TrayIcon _tray;
|
private readonly TrayIcon _tray;
|
||||||
private readonly MainViewModel _vm;
|
private readonly MainViewModel _vm;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Set to true when the user has explicitly asked to quit (File -> Exit or
|
||||||
|
/// Tray -> Exit). The OnClosing handler reads this to decide whether to
|
||||||
|
/// actually let the window close or hide it to the tray.
|
||||||
|
/// </summary>
|
||||||
|
public bool ExitForReal { get; set; }
|
||||||
|
|
||||||
public MainWindow()
|
public MainWindow()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
_vm = new MainViewModel(new AdminPipeClient());
|
_vm = new MainViewModel(new AdminPipeClient());
|
||||||
DataContext = _vm;
|
DataContext = _vm;
|
||||||
|
_vm.RealExitRequested += OnRealExitRequested;
|
||||||
|
|
||||||
_tray = new TrayIcon(
|
_tray = new TrayIcon(
|
||||||
resolveMainWindow: () => Application.Current.MainWindow,
|
resolveMainWindow: () => Application.Current.MainWindow,
|
||||||
restartServiceAsync: async () => await new AdminPipeClient().RestartListenerAsync());
|
restartServiceAsync: async () => await new AdminPipeClient().RestartListenerAsync(),
|
||||||
|
onExit: OnRealExitRequested);
|
||||||
|
|
||||||
Loaded += async (_, _) => await _vm.RefreshCommand.ExecuteAsync(null);
|
Loaded += async (_, _) => await _vm.RefreshCommand.ExecuteAsync(null);
|
||||||
StateChanged += OnStateChanged;
|
StateChanged += OnStateChanged;
|
||||||
Closed += (_, _) => _tray.Dispose();
|
Closing += OnClosing;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnClosing(object? sender, CancelEventArgs e)
|
||||||
|
{
|
||||||
|
if (ExitForReal)
|
||||||
|
{
|
||||||
|
_tray.Dispose();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// Treat the X button / Alt+F4 like a minimize: hide to tray, keep the
|
||||||
|
// process alive so the tray icon persists.
|
||||||
|
e.Cancel = true;
|
||||||
|
Hide();
|
||||||
|
ShowInTaskbar = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnRealExitRequested()
|
||||||
|
{
|
||||||
|
ExitForReal = true;
|
||||||
|
Application.Current.Shutdown();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnStateChanged(object? sender, EventArgs e)
|
private void OnStateChanged(object? sender, EventArgs e)
|
||||||
|
|||||||
@@ -16,11 +16,13 @@ public sealed class TrayIcon : IDisposable
|
|||||||
private readonly NotifyIcon _icon;
|
private readonly NotifyIcon _icon;
|
||||||
private readonly Func<Window?> _resolveMainWindow;
|
private readonly Func<Window?> _resolveMainWindow;
|
||||||
private readonly Func<Task> _restartServiceAsync;
|
private readonly Func<Task> _restartServiceAsync;
|
||||||
|
private readonly Action _onExit;
|
||||||
|
|
||||||
public TrayIcon(Func<Window?> resolveMainWindow, Func<Task> restartServiceAsync)
|
public TrayIcon(Func<Window?> resolveMainWindow, Func<Task> restartServiceAsync, Action onExit)
|
||||||
{
|
{
|
||||||
_resolveMainWindow = resolveMainWindow;
|
_resolveMainWindow = resolveMainWindow;
|
||||||
_restartServiceAsync = restartServiceAsync;
|
_restartServiceAsync = restartServiceAsync;
|
||||||
|
_onExit = onExit;
|
||||||
|
|
||||||
_icon = new NotifyIcon
|
_icon = new NotifyIcon
|
||||||
{
|
{
|
||||||
@@ -39,7 +41,7 @@ public sealed class TrayIcon : IDisposable
|
|||||||
menu.Items.Add(new ToolStripSeparator());
|
menu.Items.Add(new ToolStripSeparator());
|
||||||
menu.Items.Add("&Restart service", null, async (_, _) => await _restartServiceAsync().ConfigureAwait(false));
|
menu.Items.Add("&Restart service", null, async (_, _) => await _restartServiceAsync().ConfigureAwait(false));
|
||||||
menu.Items.Add(new ToolStripSeparator());
|
menu.Items.Add(new ToolStripSeparator());
|
||||||
menu.Items.Add("E&xit", null, (_, _) => Application.Current.Shutdown());
|
menu.Items.Add("E&xit", null, (_, _) => _onExit());
|
||||||
return menu;
|
return menu;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -286,10 +286,14 @@ public sealed partial class MainViewModel : ObservableObject
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>Raised when the user picks File -> Exit. MainWindow flips its
|
||||||
|
/// ExitForReal flag and shuts down, bypassing the X-hides-to-tray logic.</summary>
|
||||||
|
public event Action? RealExitRequested;
|
||||||
|
|
||||||
[RelayCommand]
|
[RelayCommand]
|
||||||
private void Exit()
|
private void Exit()
|
||||||
{
|
{
|
||||||
Application.Current.Shutdown();
|
RealExitRequested?.Invoke();
|
||||||
}
|
}
|
||||||
|
|
||||||
[RelayCommand]
|
[RelayCommand]
|
||||||
|
|||||||
Reference in New Issue
Block a user