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

[macOS] fix: cant directly show window when click Show or hide the main window on minimized

Browse source
This commit is contained in:
ShiinaRinne 2025-01-29 18:02:40 +08:00
parent 469967714c
commit 4bed4f9650
1 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -399,28 +399,28 @@ namespace v2rayN.Desktop.Views
public void ShowHideWindow(bool? blShow) public void ShowHideWindow(bool? blShow)
{ {
var bl = blShow ?? !_config.UiItem.ShowInTaskbar; var bl = blShow ?? (!_config.UiItem.ShowInTaskbar ^ (WindowState==WindowState.Minimized));
if (bl) if (bl)
{ {
this.Show(); this.Show();
if (this.WindowState == WindowState.Minimized) if (this.WindowState == WindowState.Minimized)
{ {
this.WindowState = WindowState.Normal; this.WindowState = WindowState.Normal;
} }
this.Activate(); this.Activate();
this.Focus(); this.Focus();
} }
else else
{ {
if (_config.UiItem.Hide2TrayWhenClose) if (Utils.IsOSX() || _config.UiItem.Hide2TrayWhenClose)
{ {
this.Hide(); this.Hide();
} }
else else
{ {
this.WindowState = WindowState.Minimized; this.WindowState = WindowState.Minimized;
} }
} }
_config.UiItem.ShowInTaskbar = bl; _config.UiItem.ShowInTaskbar = bl;
} }