Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-11-04 06:22:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Removed the Hide to tray when closing the window feature for Windows version

Browse source 
https://github.com/2dust/v2rayN/issues/6726
This commit is contained in:
2dust 2025-02-19 10:42:31 +08:00
parent eee87ded29
commit bb8eef3bf5
3 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
View file

@ -414,19 +414,18 @@ namespace v2rayN.Desktop.Views
} }
else else
{ {
if (Utils.IsOSX() || _config.UiItem.Hide2TrayWhenClose) if (Utils.IsLinux() && _config.UiItem.Hide2TrayWhenClose == false)
{ {
this.WindowState = WindowState.Minimized;
return;
}
foreach (var ownedWindow in this.OwnedWindows) foreach (var ownedWindow in this.OwnedWindows)
{ {
ownedWindow.Close(); ownedWindow.Close();
} }
this.Hide(); this.Hide();
} }
else
{
this.WindowState = WindowState.Minimized;
}
}
_config.UiItem.ShowInTaskbar = bl; _config.UiItem.ShowInTaskbar = bl;
} }

1
v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
View file

@ -459,6 +459,7 @@
Classes="Margin8" /> Classes="Margin8" />
<TextBlock <TextBlock
x:Name="labHide2TrayWhenClose"
Grid.Row="9" Grid.Row="9"
Grid.Column="0" Grid.Column="0"
VerticalAlignment="Center" VerticalAlignment="Center"

14
v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs
View file

@ -174,15 +174,27 @@ namespace v2rayN.Desktop.Views
if (Utils.IsWindows()) if (Utils.IsWindows())
{ {
txbSettingsExceptionTip2.IsVisible = false; txbSettingsExceptionTip2.IsVisible = false;
txtLinuxSudoPassword.IsVisible = false; txtLinuxSudoPassword.IsVisible = false;
labLinuxSudoPassword.IsVisible = false; labLinuxSudoPassword.IsVisible = false;
labLinuxSudoPasswordTip.IsVisible = false; labLinuxSudoPasswordTip.IsVisible = false;
labHide2TrayWhenClose.IsVisible = false;
togHide2TrayWhenClose.IsVisible = false;
} }
else else if (Utils.IsLinux())
{ {
txbSettingsExceptionTip.IsVisible = false; txbSettingsExceptionTip.IsVisible = false;
panSystemProxyAdvanced.IsVisible = false; panSystemProxyAdvanced.IsVisible = false;
} }
else if (Utils.IsOSX())
{
txbSettingsExceptionTip.IsVisible = false;
panSystemProxyAdvanced.IsVisible = false;
labHide2TrayWhenClose.IsVisible = false;
togHide2TrayWhenClose.IsVisible = false;
}
} }
private async Task<bool> UpdateViewHandler(EViewAction action, object? obj) private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)