Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-08-30 14:56:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

修复：窗口隐藏启动时闪烁的问题

Browse source
This commit is contained in:
fonaix 2024-11-30 23:59:34 +08:00
parent f29e1f8c45
commit c23c4c27f2
4 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
v2rayN/ServiceLib/Enums/EViewAction.cs
View file

@ -14,6 +14,7 @@
ShareSub,
ShareServer,
ShowHideWindow,
ShowInTaskbar,
ScanScreenTask,
ScanImageTask,
Shutdown,

10
v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
View file

@ -218,7 +218,6 @@ namespace ServiceLib.ViewModels
}
await Reload();
await AutoHideStartup();
Locator.Current.GetService<StatusBarViewModel>()?.RefreshRoutingsMenu();
}
@ -331,6 +330,7 @@ namespace ServiceLib.ViewModels
public void ShowHideWindow(bool? blShow)
{
_updateView?.Invoke(EViewAction.ShowHideWindow, blShow);
_updateView?.Invoke(EViewAction.ShowInTaskbar, blShow);
}
#endregion Actions
@ -586,14 +586,6 @@ namespace ServiceLib.ViewModels
await CoreHandler.Instance.CoreStop();
}
private async Task AutoHideStartup()
{
if (_config.UiItem.AutoHideStartup)
{
ShowHideWindow(false);
}
}
#endregion core job
#region Presets

17
v2rayN/v2rayN.Desktop/App.axaml.cs
View file

@ -1,4 +1,5 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Markup.Xaml;
using Splat;
@ -30,10 +31,20 @@ public partial class App : Application
{
if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
{
AppHandler.Instance.InitComponents();
desktop.Exit += OnExit;
desktop.MainWindow = new MainWindow();
// 先完成组件初始化
AppHandler.Instance.InitComponents();
var mainWindow = new MainWindow();
if (AppHandler.Instance.Config.UiItem.AutoHideStartup)
{
// 创建主窗口实例但暂不显示
mainWindow.ShowInTaskbar = false;
mainWindow.WindowState = WindowState.Minimized;
mainWindow.IsVisible = false;
}
desktop.MainWindow = mainWindow;
}
base.OnFrameworkInitializationCompleted();

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

@ -207,6 +207,11 @@ namespace v2rayN.Desktop.Views
DispatcherPriority.Default);
break;
case EViewAction.ShowInTaskbar:
Dispatcher.UIThread.Post(() =>
showInTaskbar((bool?)obj),
DispatcherPriority.Default);
break;
case EViewAction.DispatcherStatistics:
if (obj is null) return false;
Dispatcher.UIThread.Post(() =>
@ -383,6 +388,12 @@ namespace v2rayN.Desktop.Views
#region UI
private void showInTaskbar(bool? blShow)
{
var bl = blShow ?? this.WindowState == WindowState.Normal;
this.ShowInTaskbar = bl;
}
public void ShowHideWindow(bool? blShow)
{
var bl = blShow ?? !_config.UiItem.ShowInTaskbar;