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

Persist message auto-scroll setting

Browse source
This commit is contained in:
Vinny 2026-05-08 07:42:26 +03:00
parent e6f1efd4f4
commit 9326a4ad79
4 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
v2rayN/ServiceLib/Models/ConfigItems.cs
View file

@ -83,6 +83,7 @@ public class MsgUIItem
{ {
public string? MainMsgFilter { get; set; } public string? MainMsgFilter { get; set; }
public bool? AutoRefresh { get; set; } public bool? AutoRefresh { get; set; }
public bool? AutoScrollToEnd { get; set; }
} }
[Serializable] [Serializable]

9
v2rayN/ServiceLib/ViewModels/MsgViewModel.cs
View file

@ -13,12 +13,16 @@ public class MsgViewModel : MyReactiveObject
[Reactive] [Reactive]
public bool AutoRefresh { get; set; } public bool AutoRefresh { get; set; }
[Reactive]
public bool AutoScrollToEnd { get; set; }
public MsgViewModel(Func<EViewAction, object?, Task<bool>>? updateView) public MsgViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
{ {
_config = AppManager.Instance.Config; _config = AppManager.Instance.Config;
_updateView = updateView; _updateView = updateView;
MsgFilter = _config.MsgUIItem.MainMsgFilter ?? string.Empty; MsgFilter = _config.MsgUIItem.MainMsgFilter ?? string.Empty;
AutoRefresh = _config.MsgUIItem.AutoRefresh ?? true; AutoRefresh = _config.MsgUIItem.AutoRefresh ?? true;
AutoScrollToEnd = _config.MsgUIItem.AutoScrollToEnd ?? true;
this.WhenAnyValue( this.WhenAnyValue(
x => x.MsgFilter) x => x.MsgFilter)
@ -29,6 +33,11 @@ public class MsgViewModel : MyReactiveObject
y => y == true) y => y == true)
.Subscribe(c => _config.MsgUIItem.AutoRefresh = AutoRefresh); .Subscribe(c => _config.MsgUIItem.AutoRefresh = AutoRefresh);
this.WhenAnyValue(
x => x.AutoScrollToEnd,
y => y == true)
.Subscribe(c => _config.MsgUIItem.AutoScrollToEnd = AutoScrollToEnd);
AppEvents.SendMsgViewRequested AppEvents.SendMsgViewRequested
.AsObservable() .AsObservable()
//.ObserveOn(RxSchedulers.MainThreadScheduler) //.ObserveOn(RxSchedulers.MainThreadScheduler)

3
v2rayN/v2rayN.Desktop/Views/MsgView.axaml.cs
View file

@ -16,6 +16,7 @@ public partial class MsgView : ReactiveUserControl<MsgViewModel>
{ {
this.Bind(ViewModel, vm => vm.MsgFilter, v => v.cmbMsgFilter.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.MsgFilter, v => v.cmbMsgFilter.Text).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.AutoRefresh, v => v.togAutoRefresh.IsChecked).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.AutoRefresh, v => v.togAutoRefresh.IsChecked).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.AutoScrollToEnd, v => v.togScrollToEnd.IsChecked).DisposeWith(disposables);
}); });
TextEditorKeywordHighlighter.Attach(txtMsg, Global.LogLevelColors.ToDictionary( TextEditorKeywordHighlighter.Attach(txtMsg, Global.LogLevelColors.ToDictionary(
@ -55,7 +56,7 @@ public partial class MsgView : ReactiveUserControl<MsgViewModel>
} }
txtMsg.AppendText(msg.ToString()); txtMsg.AppendText(msg.ToString());
if (togScrollToEnd.IsChecked ?? true) if (ViewModel?.AutoScrollToEnd == true)
{ {
txtMsg.ScrollToEnd(); txtMsg.ScrollToEnd();
} }

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

@ -12,6 +12,7 @@ public partial class MsgView
{ {
this.Bind(ViewModel, vm => vm.MsgFilter, v => v.cmbMsgFilter.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.MsgFilter, v => v.cmbMsgFilter.Text).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.AutoRefresh, v => v.togAutoRefresh.IsChecked).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.AutoRefresh, v => v.togAutoRefresh.IsChecked).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.AutoScrollToEnd, v => v.togScrollToEnd.IsChecked).DisposeWith(disposables);
}); });
btnCopy.Click += menuMsgViewCopyAll_Click; btnCopy.Click += menuMsgViewCopyAll_Click;
@ -51,7 +52,7 @@ public partial class MsgView
} }
txtMsg.AppendText(msg.ToString()); txtMsg.AppendText(msg.ToString());
if (togScrollToEnd.IsChecked ?? true) if (ViewModel?.AutoScrollToEnd == true)
{ {
txtMsg.ScrollToEnd(); txtMsg.ScrollToEnd();
} }