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

Code clean

Browse source
This commit is contained in:
2dust 2025-10-31 20:25:50 +08:00
parent 18ea6fdc00
commit 1b5069a933
23 changed files with 102 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
v2rayN/v2rayN/App.xaml.cs
View file

@ -9,7 +9,7 @@ public partial class App : Application
public App()
{
this.DispatcherUnhandledException += App_DispatcherUnhandledException;
DispatcherUnhandledException += App_DispatcherUnhandledException;
AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
TaskScheduler.UnobservedTaskException += TaskScheduler_UnobservedTaskException;
}
@ -23,7 +23,7 @@ public partial class App : Application
var exePathKey = Utils.GetMd5(Utils.GetExePath());
var rebootas = (e.Args ?? Array.Empty<string>()).Any(t => t == Global.RebootAs);
ProgramStarted = new EventWaitHandle(false, EventResetMode.AutoReset, exePathKey, out bool bCreatedNew);
ProgramStarted = new EventWaitHandle(false, EventResetMode.AutoReset, exePathKey, out var bCreatedNew);
if (!rebootas && !bCreatedNew)
{
ProgramStarted.Set();

2
v2rayN/v2rayN/Common/UI.cs
View file

@ -1,6 +1,6 @@
using Microsoft.Win32;
namespace v2rayN;
namespace v2rayN.Common;
internal class UI
{

12
v2rayN/v2rayN/Common/WindowsUtils.cs
View file

@ -3,7 +3,7 @@ using System.Windows.Media;
using System.Windows.Media.Imaging;
using Microsoft.Win32;
namespace v2rayN;
namespace v2rayN.Common;
internal static class WindowsUtils
{
@ -40,13 +40,13 @@ internal static class WindowsUtils
}
[DllImport("dwmapi.dll")]
public static extern int DwmSetWindowAttribute(IntPtr hwnd, DWMWINDOWATTRIBUTE attribute, ref int attributeValue, uint attributeSize);
public static extern int DwmSetWindowAttribute(nint hwnd, DWMWINDOWATTRIBUTE attribute, ref int attributeValue, uint attributeSize);
public static ImageSource IconToImageSource(Icon icon)
{
return Imaging.CreateBitmapSourceFromHIcon(
icon.Handle,
new System.Windows.Int32Rect(0, 0, icon.Width, icon.Height),
new Int32Rect(0, 0, icon.Width, icon.Height),
BitmapSizeOptions.FromEmptyOptions());
}
@ -65,9 +65,9 @@ internal static class WindowsUtils
private static void SetDarkBorder(Window window, bool dark)
{
// Make sure the handle is created before the window is shown
IntPtr hWnd = new WindowInteropHelper(window).EnsureHandle();
int attribute = dark ? 1 : 0;
uint attributeSize = (uint)Marshal.SizeOf(attribute);
var hWnd = new WindowInteropHelper(window).EnsureHandle();
var attribute = dark ? 1 : 0;
var attributeSize = (uint)Marshal.SizeOf(attribute);
DwmSetWindowAttribute(hWnd, DWMWINDOWATTRIBUTE.DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1, ref attribute, attributeSize);
DwmSetWindowAttribute(hWnd, DWMWINDOWATTRIBUTE.DWMWA_USE_IMMERSIVE_DARK_MODE, ref attribute, attributeSize);
}

4
v2rayN/v2rayN/Manager/HotkeyManager.cs
View file

@ -43,7 +43,7 @@ public sealed class HotkeyManager
modifiers |= KeyModifiers.Alt;
}
key = key << 16 | (int)modifiers;
key = (key << 16) | (int)modifiers;
if (!_hotkeyTriggerDic.ContainsKey(key))
{
_hotkeyTriggerDic.Add(key, new() { item.EGlobalHotkey });
@ -103,7 +103,7 @@ public sealed class HotkeyManager
private (int fsModifiers, int vKey, string hotkeyStr, List<string> Names) GetHotkeyInfo(int hotkeyCode)
{
var fsModifiers = hotkeyCode & 0xffff;
var vKey = hotkeyCode >> 16 & 0xffff;
var vKey = (hotkeyCode >> 16) & 0xffff;
var hotkeyStr = new StringBuilder();
var names = new List<string>();

12
v2rayN/v2rayN/Manager/WindowsManager.cs
View file

@ -60,18 +60,18 @@ public sealed class WindowsManager
return null;
}
Color color = ColorTranslator.FromHtml("#3399CC");
int index = (int)config.SystemProxyItem.SysProxyType;
var color = ColorTranslator.FromHtml("#3399CC");
var index = (int)config.SystemProxyItem.SysProxyType;
if (index > 0)
{
color = (new[] { Color.Red, Color.Purple, Color.DarkGreen, Color.Orange, Color.DarkSlateBlue, Color.RoyalBlue })[index - 1];
}
int width = 128;
int height = 128;
var width = 128;
var height = 128;
Bitmap bitmap = new(width, height);
Graphics graphics = Graphics.FromImage(bitmap);
var graphics = Graphics.FromImage(bitmap);
SolidBrush drawBrush = new(color);
graphics.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
@ -79,7 +79,7 @@ public sealed class WindowsManager
graphics.DrawImage(new Bitmap(item.CustomIcon), 0, 0, width, height);
graphics.FillEllipse(drawBrush, width / 2, width / 2, width / 2, width / 2);
Icon createdIcon = Icon.FromHandle(bitmap.GetHicon());
var createdIcon = Icon.FromHandle(bitmap.GetHicon());
drawBrush.Dispose();
graphics.Dispose();

12
v2rayN/v2rayN/Views/AddGroupServerWindow.xaml.cs
View file

@ -6,9 +6,9 @@ public partial class AddGroupServerWindow
{
InitializeComponent();
this.Owner = Application.Current.MainWindow;
this.Loaded += Window_Loaded;
this.PreviewKeyDown += AddGroupServerWindow_PreviewKeyDown;
Owner = Application.Current.MainWindow;
Loaded += Window_Loaded;
PreviewKeyDown += AddGroupServerWindow_PreviewKeyDown;
lstChild.SelectionChanged += LstChild_SelectionChanged;
menuSelectAllChild.Click += MenuSelectAllChild_Click;
@ -27,11 +27,11 @@ public partial class AddGroupServerWindow
switch (profileItem.ConfigType)
{
case EConfigType.PolicyGroup:
this.Title = ResUI.TbConfigTypePolicyGroup;
Title = ResUI.TbConfigTypePolicyGroup;
break;
case EConfigType.ProxyChain:
this.Title = ResUI.TbConfigTypeProxyChain;
Title = ResUI.TbConfigTypeProxyChain;
gridPolicyGroup.Visibility = Visibility.Collapsed;
break;
}
@ -61,7 +61,7 @@ public partial class AddGroupServerWindow
switch (action)
{
case EViewAction.CloseWindow:
this.DialogResult = true;
DialogResult = true;
break;
}
return await Task.FromResult(true);

8
v2rayN/v2rayN/Views/AddServer2Window.xaml.cs
View file

@ -6,8 +6,8 @@ public partial class AddServer2Window
{
InitializeComponent();
this.Owner = Application.Current.MainWindow;
this.Loaded += Window_Loaded;
Owner = Application.Current.MainWindow;
Loaded += Window_Loaded;
ViewModel = new AddServer2ViewModel(profileItem, UpdateViewHandler);
cmbCoreType.ItemsSource = Utils.GetEnumNames<ECoreType>().Where(t => t != ECoreType.v2rayN.ToString()).ToList().AppendEmpty();
@ -32,11 +32,11 @@ public partial class AddServer2Window
switch (action)
{
case EViewAction.CloseWindow:
this.DialogResult = true;
DialogResult = true;
break;
case EViewAction.BrowseServer:
if (UI.OpenFileDialog(out string fileName, "Config|*.json|YAML|*.yaml;*.yml|All|*.*") != true)
if (UI.OpenFileDialog(out var fileName, "Config|*.json|YAML|*.yaml;*.yml|All|*.*") != true)
{
return false;
}

8
v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
View file

@ -8,8 +8,8 @@ public partial class AddServerWindow
{
InitializeComponent();
this.Owner = Application.Current.MainWindow;
this.Loaded += Window_Loaded;
Owner = Application.Current.MainWindow;
Loaded += Window_Loaded;
cmbNetwork.SelectionChanged += CmbNetwork_SelectionChanged;
cmbStreamSecurity.SelectionChanged += CmbStreamSecurity_SelectionChanged;
btnGUID.Click += btnGUID_Click;
@ -191,7 +191,7 @@ public partial class AddServerWindow
this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
});
this.Title = $"{profileItem.ConfigType}";
Title = $"{profileItem.ConfigType}";
WindowsUtils.SetDarkBorder(this, AppManager.Instance.Config.UiItem.CurrentTheme);
}
@ -200,7 +200,7 @@ public partial class AddServerWindow
switch (action)
{
case EViewAction.CloseWindow:
this.DialogResult = true;
DialogResult = true;
break;
}
return await Task.FromResult(true);

4
v2rayN/v2rayN/Views/BackupAndRestoreView.xaml.cs
View file

@ -28,7 +28,7 @@ public partial class BackupAndRestoreView
private void MenuLocalBackup_Click(object sender, RoutedEventArgs e)
{
if (UI.SaveFileDialog(out string fileName, "Zip|*.zip") != true)
if (UI.SaveFileDialog(out var fileName, "Zip|*.zip") != true)
{
return;
}
@ -37,7 +37,7 @@ public partial class BackupAndRestoreView
private void MenuLocalRestore_Click(object sender, RoutedEventArgs e)
{
if (UI.OpenFileDialog(out string fileName, "Zip|*.zip|All|*.*") != true)
if (UI.OpenFileDialog(out var fileName, "Zip|*.zip|All|*.*") != true)
{
return;
}

4
v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs
View file

@ -8,7 +8,7 @@ public partial class DNSSettingWindow
{
InitializeComponent();
this.Owner = Application.Current.MainWindow;
Owner = Application.Current.MainWindow;
_config = AppManager.Instance.Config;
ViewModel = new DNSSettingViewModel(UpdateViewHandler);
@ -78,7 +78,7 @@ public partial class DNSSettingWindow
switch (action)
{
case EViewAction.CloseWindow:
this.DialogResult = true;
DialogResult = true;
break;
}
return await Task.FromResult(true);

4
v2rayN/v2rayN/Views/FullConfigTemplateWindow.xaml.cs
View file

@ -8,7 +8,7 @@ public partial class FullConfigTemplateWindow
{
InitializeComponent();
this.Owner = Application.Current.MainWindow;
Owner = Application.Current.MainWindow;
_config = AppManager.Instance.Config;
ViewModel = new FullConfigTemplateViewModel(UpdateViewHandler);
@ -35,7 +35,7 @@ public partial class FullConfigTemplateWindow
switch (action)
{
case EViewAction.CloseWindow:
this.DialogResult = true;
DialogResult = true;
break;
}
return await Task.FromResult(true);

6
v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs
View file

@ -11,14 +11,14 @@ public partial class GlobalHotkeySettingWindow
{
InitializeComponent();
this.Owner = Application.Current.MainWindow;
Owner = Application.Current.MainWindow;
ViewModel = new GlobalHotkeySettingViewModel(UpdateViewHandler);
btnReset.Click += btnReset_Click;
HotkeyManager.Instance.IsPause = true;
this.Closing += (s, e) => HotkeyManager.Instance.IsPause = false;
Closing += (s, e) => HotkeyManager.Instance.IsPause = false;
this.WhenActivated(disposables =>
{
@ -35,7 +35,7 @@ public partial class GlobalHotkeySettingWindow
switch (action)
{
case EViewAction.CloseWindow:
this.DialogResult = true;
DialogResult = true;
break;
}
return await Task.FromResult(true);

28
v2rayN/v2rayN/Views/MainWindow.xaml.cs
View file

@ -19,8 +19,8 @@ public partial class MainWindow
ThreadPool.RegisterWaitForSingleObject(App.ProgramStarted, OnProgramStarted, null, -1, false);
App.Current.SessionEnding += Current_SessionEnding;
this.Closing += MainWindow_Closing;
this.PreviewKeyDown += MainWindow_PreviewKeyDown;
Closing += MainWindow_Closing;
PreviewKeyDown += MainWindow_PreviewKeyDown;
menuSettingsSetUWP.Click += menuSettingsSetUWP_Click;
menuPromotion.Click += menuPromotion_Click;
menuClose.Click += menuClose_Click;
@ -150,10 +150,10 @@ public partial class MainWindow
.DisposeWith(disposables);
});
this.Title = $"{Utils.GetVersion()} - {(Utils.IsAdministrator() ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}";
Title = $"{Utils.GetVersion()} - {(Utils.IsAdministrator() ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}";
if (_config.UiItem.AutoHideStartup)
{
this.WindowState = WindowState.Minimized;
WindowState = WindowState.Minimized;
}
if (!_config.GuiItem.EnableHWA)
@ -187,35 +187,35 @@ public partial class MainWindow
case EViewAction.AddServerWindow:
if (obj is null)
return false;
return (new AddServerWindow((ProfileItem)obj)).ShowDialog() ?? false;
return new AddServerWindow((ProfileItem)obj).ShowDialog() ?? false;
case EViewAction.AddServer2Window:
if (obj is null)
return false;
return (new AddServer2Window((ProfileItem)obj)).ShowDialog() ?? false;
return new AddServer2Window((ProfileItem)obj).ShowDialog() ?? false;
case EViewAction.AddGroupServerWindow:
if (obj is null)
return false;
return (new AddGroupServerWindow((ProfileItem)obj)).ShowDialog() ?? false;
return new AddGroupServerWindow((ProfileItem)obj).ShowDialog() ?? false;
case EViewAction.DNSSettingWindow:
return (new DNSSettingWindow().ShowDialog() ?? false);
return new DNSSettingWindow().ShowDialog() ?? false;
case EViewAction.RoutingSettingWindow:
return (new RoutingSettingWindow().ShowDialog() ?? false);
return new RoutingSettingWindow().ShowDialog() ?? false;
case EViewAction.OptionSettingWindow:
return (new OptionSettingWindow().ShowDialog() ?? false);
return new OptionSettingWindow().ShowDialog() ?? false;
case EViewAction.FullConfigTemplateWindow:
return (new FullConfigTemplateWindow().ShowDialog() ?? false);
return new FullConfigTemplateWindow().ShowDialog() ?? false;
case EViewAction.GlobalHotkeySettingWindow:
return (new GlobalHotkeySettingWindow().ShowDialog() ?? false);
return new GlobalHotkeySettingWindow().ShowDialog() ?? false;
case EViewAction.SubSettingWindow:
return (new SubSettingWindow().ShowDialog() ?? false);
return new SubSettingWindow().ShowDialog() ?? false;
case EViewAction.ScanScreenTask:
await ScanScreenTaskAsync();
@ -372,7 +372,7 @@ public partial class MainWindow
this?.Show();
if (this?.WindowState == WindowState.Minimized)
{
this.WindowState = WindowState.Normal;
WindowState = WindowState.Normal;
}
this?.Activate();
this?.Focus();

4
v2rayN/v2rayN/Views/MsgView.xaml.cs
View file

@ -31,10 +31,10 @@ public partial class MsgView
case EViewAction.DispatcherShowMsg:
if (obj is null)
return false;
Application.Current?.Dispatcher.Invoke((() =>
Application.Current?.Dispatcher.Invoke(() =>
{
ShowMsg(obj);
}), DispatcherPriority.ApplicationIdle);
}, DispatcherPriority.ApplicationIdle);
break;
}
return await Task.FromResult(true);

10
v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
View file

@ -10,7 +10,7 @@ public partial class OptionSettingWindow
{
InitializeComponent();
this.Owner = Application.Current.MainWindow;
Owner = Application.Current.MainWindow;
_config = AppManager.Instance.Config;
ViewModel = new OptionSettingViewModel(UpdateViewHandler);
@ -136,7 +136,7 @@ public partial class OptionSettingWindow
switch (action)
{
case EViewAction.CloseWindow:
this.DialogResult = true;
DialogResult = true;
break;
case EViewAction.InitSettingFont:
@ -168,12 +168,12 @@ public partial class OptionSettingWindow
foreach (var ttf in files)
{
var families = Fonts.GetFontFamilies(Utils.GetFontsPath(ttf));
foreach (FontFamily family in families)
foreach (var family in families)
{
var typefaces = family.GetTypefaces();
foreach (Typeface typeface in typefaces)
foreach (var typeface in typefaces)
{
typeface.TryGetGlyphTypeface(out GlyphTypeface glyph);
typeface.TryGetGlyphTypeface(out var glyph);
//var fontFace = glyph.Win32FaceNames[new CultureInfo("en-us")];
//if (!fontFace.Equals("Regular") && !fontFace.Equals("Normal"))
//{

2
v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml.cs
View file

@ -71,7 +71,7 @@ public partial class ProfilesSelectWindow
switch (action)
{
case EViewAction.CloseWindow:
this.DialogResult = true;
DialogResult = true;
break;
}
return await Task.FromResult(true);

18
v2rayN/v2rayN/Views/ProfilesView.xaml.cs
View file

@ -127,7 +127,7 @@ public partial class ProfilesView
case EViewAction.SaveFileDialog:
if (obj is null)
return false;
if (UI.SaveFileDialog(out string fileName, "Config|*.json") != true)
if (UI.SaveFileDialog(out var fileName, "Config|*.json") != true)
{
return false;
}
@ -137,17 +137,17 @@ public partial class ProfilesView
case EViewAction.AddServerWindow:
if (obj is null)
return false;
return (new AddServerWindow((ProfileItem)obj)).ShowDialog() ?? false;
return new AddServerWindow((ProfileItem)obj).ShowDialog() ?? false;
case EViewAction.AddServer2Window:
if (obj is null)
return false;
return (new AddServer2Window((ProfileItem)obj)).ShowDialog() ?? false;
return new AddServer2Window((ProfileItem)obj).ShowDialog() ?? false;
case EViewAction.AddGroupServerWindow:
if (obj is null)
return false;
return (new AddGroupServerWindow((ProfileItem)obj)).ShowDialog() ?? false;
return new AddGroupServerWindow((ProfileItem)obj).ShowDialog() ?? false;
case EViewAction.ShareServer:
if (obj is null)
@ -158,7 +158,7 @@ public partial class ProfilesView
case EViewAction.SubEditWindow:
if (obj is null)
return false;
return (new SubEditWindow((SubItem)obj)).ShowDialog() ?? false;
return new SubEditWindow((SubItem)obj).ShowDialog() ?? false;
case EViewAction.DispatcherRefreshServersBiz:
Application.Current?.Dispatcher.Invoke(RefreshServersBiz, DispatcherPriority.Normal);
@ -415,8 +415,8 @@ public partial class ProfilesView
private void LstProfiles_MouseMove(object sender, MouseEventArgs e)
{
// Get the current mouse position
Point mousePos = e.GetPosition(null);
Vector diff = startPoint - mousePos;
var mousePos = e.GetPosition(null);
var diff = startPoint - mousePos;
if (e.LeftButton == MouseButtonState.Pressed &&
(Math.Abs(diff.X) > SystemParameters.MinimumHorizontalDragDistance ||
@ -429,7 +429,7 @@ public partial class ProfilesView
if (listViewItem == null)
return; // Abort
// Find the data behind the ListViewItem
ProfileItemModel item = (ProfileItemModel)listView.ItemContainerGenerator.ItemFromContainer(listViewItem);
var item = (ProfileItemModel)listView.ItemContainerGenerator.ItemFromContainer(listViewItem);
if (item == null)
return; // Abort
// Initialize the drag & drop operation
@ -462,7 +462,7 @@ public partial class ProfilesView
return;
}
// Find the data behind the Item
ProfileItemModel item = (ProfileItemModel)listView.ItemContainerGenerator.ItemFromContainer(listViewItem);
var item = (ProfileItemModel)listView.ItemContainerGenerator.ItemFromContainer(listViewItem);
if (item == null)
return;
// Move item into observable collection

6
v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs
View file

@ -6,8 +6,8 @@ public partial class RoutingRuleDetailsWindow
{
InitializeComponent();
this.Owner = Application.Current.MainWindow;
this.Loaded += Window_Loaded;
Owner = Application.Current.MainWindow;
Loaded += Window_Loaded;
clbProtocol.SelectionChanged += ClbProtocol_SelectionChanged;
clbInboundTag.SelectionChanged += ClbInboundTag_SelectionChanged;
@ -54,7 +54,7 @@ public partial class RoutingRuleDetailsWindow
switch (action)
{
case EViewAction.CloseWindow:
this.DialogResult = true;
DialogResult = true;
break;
}
return await Task.FromResult(true);

16
v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs
View file

@ -6,9 +6,9 @@ public partial class RoutingRuleSettingWindow
{
InitializeComponent();
this.Owner = Application.Current.MainWindow;
this.Loaded += Window_Loaded;
this.PreviewKeyDown += RoutingRuleSettingWindow_PreviewKeyDown;
Owner = Application.Current.MainWindow;
Loaded += Window_Loaded;
PreviewKeyDown += RoutingRuleSettingWindow_PreviewKeyDown;
lstRules.SelectionChanged += lstRules_SelectionChanged;
lstRules.MouseDoubleClick += LstRules_MouseDoubleClick;
menuRuleSelectAll.Click += menuRuleSelectAll_Click;
@ -57,7 +57,7 @@ public partial class RoutingRuleSettingWindow
switch (action)
{
case EViewAction.CloseWindow:
this.DialogResult = true;
DialogResult = true;
break;
case EViewAction.ShowYesNo:
@ -80,11 +80,11 @@ public partial class RoutingRuleSettingWindow
if (obj is null)
return false;
return (new RoutingRuleDetailsWindow((RulesItem)obj)).ShowDialog() ?? false;
return new RoutingRuleDetailsWindow((RulesItem)obj).ShowDialog() ?? false;
case EViewAction.ImportRulesFromFile:
if (UI.OpenFileDialog(out string fileName, "Rules|*.json|All|*.*") != true)
if (UI.OpenFileDialog(out var fileName, "Rules|*.json|All|*.*") != true)
{
return false;
}
@ -174,7 +174,7 @@ public partial class RoutingRuleSettingWindow
private void btnBrowseCustomIcon_Click(object sender, System.Windows.RoutedEventArgs e)
{
if (UI.OpenFileDialog(out string fileName,
if (UI.OpenFileDialog(out var fileName,
"PNG,ICO|*.png;*.ico") != true)
{
return;
@ -185,7 +185,7 @@ public partial class RoutingRuleSettingWindow
private void btnBrowseCustomRulesetPath4Singbox_Click(object sender, RoutedEventArgs e)
{
if (UI.OpenFileDialog(out string fileName,
if (UI.OpenFileDialog(out var fileName,
"Config|*.json|All|*.*") != true)
{
return;

16
v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs
View file

@ -6,9 +6,9 @@ public partial class RoutingSettingWindow
{
InitializeComponent();
this.Owner = Application.Current.MainWindow;
this.Closing += RoutingSettingWindow_Closing;
this.PreviewKeyDown += RoutingSettingWindow_PreviewKeyDown;
Owner = Application.Current.MainWindow;
Closing += RoutingSettingWindow_Closing;
PreviewKeyDown += RoutingSettingWindow_PreviewKeyDown;
lstRoutings.SelectionChanged += lstRoutings_SelectionChanged;
lstRoutings.MouseDoubleClick += LstRoutings_MouseDoubleClick;
menuRoutingAdvancedSelectAll.Click += menuRoutingAdvancedSelectAll_Click;
@ -44,7 +44,7 @@ public partial class RoutingSettingWindow
switch (action)
{
case EViewAction.CloseWindow:
this.DialogResult = true;
DialogResult = true;
break;
case EViewAction.ShowYesNo:
@ -58,7 +58,7 @@ public partial class RoutingSettingWindow
if (obj is null)
return false;
return (new RoutingRuleSettingWindow((RoutingItem)obj)).ShowDialog() ?? false;
return new RoutingRuleSettingWindow((RoutingItem)obj).ShowDialog() ?? false;
}
return await Task.FromResult(true);
}
@ -67,7 +67,7 @@ public partial class RoutingSettingWindow
{
if (ViewModel?.IsModified == true)
{
this.DialogResult = true;
DialogResult = true;
}
}
@ -122,11 +122,11 @@ public partial class RoutingSettingWindow
{
if (ViewModel?.IsModified == true)
{
this.DialogResult = true;
DialogResult = true;
}
else
{
this.Close();
Close();
}
}
}

4
v2rayN/v2rayN/Views/StatusBarView.xaml.cs
View file

@ -71,11 +71,11 @@ public partial class StatusBarView
switch (action)
{
case EViewAction.DispatcherRefreshIcon:
Application.Current?.Dispatcher.Invoke((async () =>
Application.Current?.Dispatcher.Invoke(async () =>
{
tbNotify.Icon = await WindowsManager.Instance.GetNotifyIcon(_config);
Application.Current.MainWindow.Icon = WindowsManager.Instance.GetAppIcon(_config);
}), DispatcherPriority.Normal);
}, DispatcherPriority.Normal);
break;
case EViewAction.SetClipboardData:

6
v2rayN/v2rayN/Views/SubEditWindow.xaml.cs
View file

@ -6,8 +6,8 @@ public partial class SubEditWindow
{
InitializeComponent();
this.Owner = Application.Current.MainWindow;
this.Loaded += Window_Loaded;
Owner = Application.Current.MainWindow;
Loaded += Window_Loaded;
ViewModel = new SubEditViewModel(subItem, UpdateViewHandler);
@ -39,7 +39,7 @@ public partial class SubEditWindow
switch (action)
{
case EViewAction.CloseWindow:
this.DialogResult = true;
DialogResult = true;
break;
}
return await Task.FromResult(true);

14
v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs
View file

@ -8,10 +8,10 @@ public partial class SubSettingWindow
{
InitializeComponent();
this.Owner = Application.Current.MainWindow;
Owner = Application.Current.MainWindow;
ViewModel = new SubSettingViewModel(UpdateViewHandler);
this.Closing += SubSettingWindow_Closing;
Closing += SubSettingWindow_Closing;
lstSubscription.MouseDoubleClick += LstSubscription_MouseDoubleClick;
lstSubscription.SelectionChanged += LstSubscription_SelectionChanged;
menuClose.Click += menuClose_Click;
@ -34,7 +34,7 @@ public partial class SubSettingWindow
switch (action)
{
case EViewAction.CloseWindow:
this.DialogResult = true;
DialogResult = true;
break;
case EViewAction.ShowYesNo:
@ -47,7 +47,7 @@ public partial class SubSettingWindow
case EViewAction.SubEditWindow:
if (obj is null)
return false;
return (new SubEditWindow((SubItem)obj)).ShowDialog() ?? false;
return new SubEditWindow((SubItem)obj).ShowDialog() ?? false;
case EViewAction.ShareSub:
if (obj is null)
@ -78,7 +78,7 @@ public partial class SubSettingWindow
{
if (ViewModel?.IsModified == true)
{
this.DialogResult = true;
DialogResult = true;
}
}
@ -99,11 +99,11 @@ public partial class SubSettingWindow
{
if (ViewModel?.IsModified == true)
{
this.DialogResult = true;
DialogResult = true;
}
else
{
this.Close();
Close();
}
}
}