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

Using RxApp replace ViewAction

master
2dust 2025-08-30 20:36:16 +08:00
parent ef4a1903ec
commit e3a63db966
8 changed files with 16 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,6 @@ public enum EViewAction
ShowYesNo,
SaveFileDialog,
AddBatchRoutingRulesYesNo,
AdjustMainLvColWidth,
SetClipboardData,
AddServerViaClipboard,
ImportRulesFromClipboard,

2
v2rayN/ServiceLib/Handler/AppEvents.cs
View File

@ -13,5 +13,7 @@ public static class AppEvents
public static readonly Subject<Unit> AppExitRequested = new();
public static readonly Subject<Unit> AdjustMainLvColWidthRequested = new();
public static readonly Subject<ServerSpeedItem> DispatcherStatisticsRequested = new();
}

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

@ -268,7 +268,7 @@ public class MainWindowViewModel : MyReactiveObject
}
if (_config.UiItem.EnableAutoAdjustMainLvColWidth)
{
_updateView?.Invoke(EViewAction.AdjustMainLvColWidth, null);
AppEvents.AdjustMainLvColWidthRequested.OnNext(Unit.Default);
}
}
}

5
v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs
View File

@ -348,11 +348,6 @@ public class ProfilesViewModel : MyReactiveObject
}
}
public async Task AutofitColumnWidthAsync()
{
await _updateView?.Invoke(EViewAction.AdjustMainLvColWidth, null);
}
#endregion Actions
#region Servers && Groups

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

@ -250,12 +250,6 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
await ViewModel.AddServerViaClipboardAsync(clipboardData);
}
break;
case EViewAction.AdjustMainLvColWidth:
Dispatcher.UIThread.Post(() =>
Locator.Current.GetService<ProfilesViewModel>()?.AutofitColumnWidthAsync(),
DispatcherPriority.Default);
break;
}
return await Task.FromResult(true);

13
v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
View File

@ -103,6 +103,12 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
.ObserveOn(RxApp.MainThreadScheduler)
.Subscribe(_ => StorageUI())
.DisposeWith(disposables);
AppEvents.AdjustMainLvColWidthRequested
.AsObservable()
.ObserveOn(RxApp.MainThreadScheduler)
.Subscribe(_ => AutofitColumnWidth())
.DisposeWith(disposables);
});
RestoreUI();
@ -133,13 +139,6 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
await AvaUtils.SetClipboardData(this, (string)obj);
break;
case EViewAction.AdjustMainLvColWidth:
Dispatcher.UIThread.Post(() =>
AutofitColumnWidth(),
DispatcherPriority.Default);
break;
case EViewAction.ProfilesFocus:
lstProfiles.Focus();
break;

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

@ -234,13 +234,6 @@ public partial class MainWindow
ViewModel?.AddServerViaClipboardAsync(clipboardData);
}
break;
case EViewAction.AdjustMainLvColWidth:
Application.Current?.Dispatcher.Invoke((() =>
{
Locator.Current.GetService<ProfilesViewModel>()?.AutofitColumnWidthAsync();
}), DispatcherPriority.Normal);
break;
}
return await Task.FromResult(true);

15
v2rayN/v2rayN/Views/ProfilesView.xaml.cs
View File

@ -97,6 +97,12 @@ public partial class ProfilesView
.ObserveOn(RxApp.MainThreadScheduler)
.Subscribe(_ => StorageUI())
.DisposeWith(disposables);
AppEvents.AdjustMainLvColWidthRequested
.AsObservable()
.ObserveOn(RxApp.MainThreadScheduler)
.Subscribe(_ => AutofitColumnWidth())
.DisposeWith(disposables);
});
RestoreUI();
@ -113,14 +119,7 @@ public partial class ProfilesView
if (obj is null)
return false;
WindowsUtils.SetClipboardData((string)obj);
break;
case EViewAction.AdjustMainLvColWidth:
Application.Current?.Dispatcher.Invoke((() =>
{
AutofitColumnWidth();
}), DispatcherPriority.Normal);
break;
break;
case EViewAction.ProfilesFocus:
lstProfiles.Focus();