voronin9032/v2rayN
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code clean

Browse Source
This commit is contained in:
2dust
2025-10-31 20:25:54 +08:00
parent 1b5069a933
commit d727ff40bb
16 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
View File

@@ -21,7 +21,7 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
_config = AppManager.Instance.Config;
_manager = new WindowNotificationManager(TopLevel.GetTopLevel(this)) { MaxItems = 3, Position = NotificationPosition.TopRight };
this.KeyDown += MainWindow_KeyDown;
KeyDown += MainWindow_KeyDown;
menuSettingsSetUWP.Click += menuSettingsSetUWP_Click;
menuPromotion.Click += menuPromotion_Click;
menuCheckUpdate.Click += MenuCheckUpdate_Click;
@@ -153,14 +153,14 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
if (Utils.IsWindows())
{
this.Title = $"{Utils.GetVersion()} - {(Utils.IsAdministrator() ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}";
Title = $"{Utils.GetVersion()} - {(Utils.IsAdministrator() ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}";
ThreadPool.RegisterWaitForSingleObject(Program.ProgramStarted, OnProgramStarted, null, -1, false);
HotkeyManager.Instance.Init(_config, OnHotkeyHandler);
}
else
{
this.Title = $"{Utils.GetVersion()}";
Title = $"{Utils.GetVersion()}";
menuRebootAsAdmin.IsVisible = false;
menuSettingsSetUWP.IsVisible = false;
@@ -170,7 +170,7 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
if (_config.UiItem.AutoHideStartup && Utils.IsWindows())
{
this.WindowState = WindowState.Minimized;
WindowState = WindowState.Minimized;
}
AddHelpMenuItem();
@@ -407,27 +407,27 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
: !_config.UiItem.ShowInTaskbar);
if (bl)
{
this.Show();
if (this.WindowState == WindowState.Minimized)
Show();
if (WindowState == WindowState.Minimized)
{
this.WindowState = WindowState.Normal;
WindowState = WindowState.Normal;
}
this.Activate();
this.Focus();
Activate();
Focus();
}
else
{
if (Utils.IsLinux() && _config.UiItem.Hide2TrayWhenClose == false)
{
this.WindowState = WindowState.Minimized;
WindowState = WindowState.Minimized;
return;
}
foreach (var ownedWindow in this.OwnedWindows)
foreach (var ownedWindow in OwnedWindows)
{
ownedWindow.Close();
}
this.Hide();
Hide();
}
_config.UiItem.ShowInTaskbar = bl;