github
/
v2rayN
mirror of https://github.com/2dust/v2rayN
1
0
Fork 0
Code Issues Releases Wiki Activity

Bug fix

pull/5636/head
2dust 2024-08-30 12:59:43 +08:00
parent d189f4b443
commit 79085af994
7 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
View File

@ -402,7 +402,7 @@ namespace ServiceLib.ViewModels
}
if (_config.uiItem.enableAutoAdjustMainLvColWidth)
{
Locator.Current.GetService<ProfilesViewModel>()?.AutofitColumnWidthAsync();
_updateView?.Invoke(EViewAction.AdjustMainLvColWidth, null);
}
}
}
@ -723,7 +723,7 @@ namespace ServiceLib.ViewModels
private void CheckUpdateN()
{
//Check for standalone windows .Net version
if (Utils.IsWindows()
if (Utils.IsWindows()
&& File.Exists(Path.Combine(Utils.StartupPath(), "wpfgfx_cor3.dll"))
&& File.Exists(Path.Combine(Utils.StartupPath(), "D3DCompiler_47_cor3.dll"))
)

1
v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml
View File

@ -64,6 +64,7 @@
x:Name="lstConnections"
AutoGenerateColumns="False"
BorderThickness="1"
CanUserResizeColumns="True"
GridLinesVisibility="All"
HeadersVisibility="Column"
IsReadOnly="True"

5
v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
View File

@ -279,6 +279,11 @@ namespace v2rayN.Desktop.Views
var clipboardData = await AvaUtils.GetClipboardData(this);
ViewModel?.AddServerViaClipboardAsync(clipboardData);
break;
case EViewAction.AdjustMainLvColWidth:
Dispatcher.UIThread.Post(() =>
Locator.Current.GetService<ProfilesViewModel>()?.AutofitColumnWidthAsync(),
DispatcherPriority.Default);
break;
}
return await Task.FromResult(true);

1
v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml
View File

@ -184,6 +184,7 @@
x:Name="lstRules"
AutoGenerateColumns="False"
BorderThickness="1"
CanUserResizeColumns="True"
GridLinesVisibility="All"
HeadersVisibility="Column"
IsReadOnly="True"

1
v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml
View File

@ -87,6 +87,7 @@
x:Name="lstRoutings"
AutoGenerateColumns="False"
BorderThickness="1"
CanUserResizeColumns="True"
GridLinesVisibility="All"
HeadersVisibility="Column"
IsReadOnly="True"

1
v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml
View File

@ -33,6 +33,7 @@
x:Name="lstSubscription"
AutoGenerateColumns="False"
BorderThickness="1"
CanUserResizeColumns="True"
GridLinesVisibility="All"
HeadersVisibility="Column"
IsReadOnly="True"

6
v2rayN/v2rayN/Views/MainWindow.xaml.cs
View File

@ -297,6 +297,12 @@ namespace v2rayN.Views
var clipboardData = WindowsUtils.GetClipboardData();
ViewModel?.AddServerViaClipboardAsync(clipboardData);
break;
case EViewAction.AdjustMainLvColWidth:
Application.Current?.Dispatcher.Invoke((() =>
{
Locator.Current.GetService<ProfilesViewModel>()?.AutofitColumnWidthAsync();
}), DispatcherPriority.Normal);
break;
}
return await Task.FromResult(true);