v2rayN/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.14.3</Version>
+        <Version>7.14.2</Version>
     </PropertyGroup>
 
     <PropertyGroup>

v2rayN/ServiceLib/Handler/Fmt/HtmlPageFmt.cs

@@ -1,3 +1,5 @@
+using SkiaSharp;
+
 namespace ServiceLib.Handler.Fmt;
 
 public class HtmlPageFmt : BaseFmt

v2rayN/ServiceLib/Services/DownloadService.cs

@@ -1,3 +1,4 @@
+using System.Diagnostics;
 using System.Net;
 using System.Net.Http.Headers;
 using System.Net.Sockets;

v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml.cs

@@ -16,7 +16,6 @@ public partial class DNSSettingWindow : WindowBase<DNSSettingViewModel>
         InitializeComponent();
 
         _config = AppManager.Instance.Config;
-        Loaded += Window_Loaded;
         btnCancel.Click += (s, e) => this.Close();
         ViewModel = new DNSSettingViewModel(UpdateViewHandler);
 
@@ -101,9 +100,4 @@ public partial class DNSSettingWindow : WindowBase<DNSSettingViewModel>
     {
         ProcUtils.ProcessStart("https://sing-box.sagernet.org/zh/configuration/dns/");
     }
-
-    private void Window_Loaded(object? sender, RoutedEventArgs e)
-    {
-        btnCancel.Focus();
-    }
 }

v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml.cs

@@ -15,7 +15,6 @@ public partial class FullConfigTemplateWindow : WindowBase<FullConfigTemplateVie
         InitializeComponent();
 
         _config = AppManager.Instance.Config;
-        Loaded += Window_Loaded;
         btnCancel.Click += (s, e) => this.Close();
         ViewModel = new FullConfigTemplateViewModel(UpdateViewHandler);
 
@@ -50,8 +49,4 @@ public partial class FullConfigTemplateWindow : WindowBase<FullConfigTemplateVie
     {
         ProcUtils.ProcessStart("https://github.com/2dust/v2rayN/wiki/Description-of-some-ui#%E5%AE%8C%E6%95%B4%E9%85%8D%E7%BD%AE%E6%A8%A1%E6%9D%BF%E8%AE%BE%E7%BD%AE");
     }
-    private void Window_Loaded(object? sender, RoutedEventArgs e)
-    {
-        btnCancel.Focus();
-    }
 }

v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml.cs

@@ -22,7 +22,6 @@ public partial class GlobalHotkeySettingWindow : WindowBase<GlobalHotkeySettingV
         btnReset.Click += btnReset_Click;
 
         HotkeyManager.Instance.IsPause = true;
-        Loaded += Window_Loaded;
         this.Closing += (s, e) => HotkeyManager.Instance.IsPause = false;
         btnCancel.Click += (s, e) => this.Close();
 
@@ -135,8 +134,4 @@ public partial class GlobalHotkeySettingWindow : WindowBase<GlobalHotkeySettingV
 
         return res.ToString();
     }
-    private void Window_Loaded(object? sender, RoutedEventArgs e)
-    {
-        btnCancel.Focus();
-    }
 }

v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs

@@ -1,6 +1,5 @@
 using System.Reactive.Disposables;
 using Avalonia.Controls;
-using Avalonia.Interactivity;
 using ReactiveUI;
 using ServiceLib.Manager;
 using v2rayN.Desktop.Base;
@@ -15,7 +14,6 @@ public partial class OptionSettingWindow : WindowBase<OptionSettingViewModel>
     {
         InitializeComponent();
 
-        Loaded += Window_Loaded;
         btnCancel.Click += (s, e) => this.Close();
         _config = AppManager.Instance.Config;
 
@@ -211,8 +209,4 @@ public partial class OptionSettingWindow : WindowBase<OptionSettingViewModel>
             ViewModel.destOverride = clbdestOverride.SelectedItems.Cast<string>().ToList();
         }
     }
-    private void Window_Loaded(object? sender, RoutedEventArgs e)
-    {
-        btnCancel.Focus();
-    }
 }

v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml.cs

@@ -17,7 +17,6 @@ public partial class RoutingSettingWindow : WindowBase<RoutingSettingViewModel>
     {
         InitializeComponent();
 
-        Loaded += Window_Loaded;
         this.Closing += RoutingSettingWindow_Closing;
         btnCancel.Click += (s, e) => this.Close();
         this.KeyDown += RoutingSettingWindow_KeyDown;
@@ -135,8 +134,4 @@ public partial class RoutingSettingWindow : WindowBase<RoutingSettingViewModel>
             }
         }
     }
-    private void Window_Loaded(object? sender, RoutedEventArgs e)
-    {
-        btnCancel.Focus();
-    }
 }

v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml.cs

@@ -1,6 +1,5 @@
 using System.Reactive.Disposables;
 using Avalonia.Controls;
-using Avalonia.Input;
 using Avalonia.Interactivity;
 using DialogHostAvalonia;
 using DynamicData;
@@ -20,9 +19,7 @@ public partial class SubSettingWindow : WindowBase<SubSettingViewModel>
         InitializeComponent();
 
         menuClose.Click += menuClose_Click;
-        Loaded += Window_Loaded;
         this.Closing += SubSettingWindow_Closing;
-        this.KeyDown += SubSettingWindow_KeyDown;
         ViewModel = new SubSettingViewModel(UpdateViewHandler);
         lstSubscription.DoubleTapped += LstSubscription_DoubleTapped;
         lstSubscription.SelectionChanged += LstSubscription_SelectionChanged;
@@ -109,16 +106,4 @@ public partial class SubSettingWindow : WindowBase<SubSettingViewModel>
             }
         }
     }
-
-    private void SubSettingWindow_KeyDown(object? sender, KeyEventArgs e)
-    {
-        if (e.Key == Key.Escape)
-        {
-            menuClose_Click(null, null);
-        }
-    }
-    private void Window_Loaded(object? sender, RoutedEventArgs e)
-    {
-        lstSubscription.Focus();
-    }
 }

v2rayN/v2rayN/Manager/WindowsManager.cs

@@ -1,6 +1,7 @@
 using System.Drawing;
 using System.IO;
 using System.Windows.Media.Imaging;
+using v2rayN.Manager;
 
 namespace v2rayN.Manager;