Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b8d124a2b2 | |||
| b17d832842 | |||
| fe42f2f908 | |||
| 93a9c327e0 | |||
| 9e6abeef74 | |||
| 9525ee358e | |||
| f3bca1e8ff |
@@ -1,4 +1,3 @@
|
|||||||
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;
|
||||||
@@ -12,48 +11,19 @@ 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;
|
||||||
Closing += OnClosing;
|
Closed += (_, _) => _tray.Dispose();
|
||||||
}
|
|
||||||
|
|
||||||
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,13 +16,11 @@ 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, Action onExit)
|
public TrayIcon(Func<Window?> resolveMainWindow, Func<Task> restartServiceAsync)
|
||||||
{
|
{
|
||||||
_resolveMainWindow = resolveMainWindow;
|
_resolveMainWindow = resolveMainWindow;
|
||||||
_restartServiceAsync = restartServiceAsync;
|
_restartServiceAsync = restartServiceAsync;
|
||||||
_onExit = onExit;
|
|
||||||
|
|
||||||
_icon = new NotifyIcon
|
_icon = new NotifyIcon
|
||||||
{
|
{
|
||||||
@@ -41,7 +39,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, (_, _) => _onExit());
|
menu.Items.Add("E&xit", null, (_, _) => Application.Current.Shutdown());
|
||||||
return menu;
|
return menu;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -286,14 +286,10 @@ 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()
|
||||||
{
|
{
|
||||||
RealExitRequested?.Invoke();
|
Application.Current.Shutdown();
|
||||||
}
|
}
|
||||||
|
|
||||||
[RelayCommand]
|
[RelayCommand]
|
||||||
|
|||||||
Reference in New Issue
Block a user