pjandro/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2026-11-06 12:35:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix ViewModel and UI (#10093)

Browse Source 
* Fix avalonia ScrollToEnd

* Refactor ViewModel
This commit is contained in:
DHR60
2026-09-04 06:46:41 +00:00
committed by GitHub
parent fe2e219b7a
commit b8e8321603
20 changed files with 130 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs
+11 -12
View File
@@ -35,39 +35,38 @@ public partial class ThemeSettingViewModel : MyReactiveObject
CurrentLanguage = _config.UiItem.CurrentLanguage;
this.WhenAnyValue(x => x.CurrentTheme)
.Subscribe(c =>
.Where(y => y.IsNotEmpty())
.SubscribeAsync(async _ =>
{
if (_config.UiItem.CurrentTheme != CurrentTheme)
{
_config.UiItem.CurrentTheme = CurrentTheme;
ModifyTheme();
_ = ConfigHandler.SaveConfig(_config);
await ConfigHandler.SaveConfig(_config);
}
});
this.WhenAnyValue(
x => x.CurrentFontSize,
y => y > 0)
.Subscribe(c =>
this.WhenAnyValue(x => x.CurrentFontSize)
.Where(y => y > 0)
.SubscribeAsync(async _ =>
{
if (_config.UiItem.CurrentFontSize != CurrentFontSize && CurrentFontSize >= Global.MinFontSize)
{
_config.UiItem.CurrentFontSize = CurrentFontSize;
ModifyFontSize();
_ = ConfigHandler.SaveConfig(_config);
await ConfigHandler.SaveConfig(_config);
}
});
this.WhenAnyValue(
x => x.CurrentLanguage,
y => y != null && !y.IsNullOrEmpty())
.Subscribe(c =>
this.WhenAnyValue(x => x.CurrentLanguage)
.Where(y => !y.IsNullOrEmpty())
.SubscribeAsync(async _ =>
{
if (CurrentLanguage.IsNotEmpty() && _config.UiItem.CurrentLanguage != CurrentLanguage)
{
_config.UiItem.CurrentLanguage = CurrentLanguage;
Thread.CurrentThread.CurrentUICulture = new(CurrentLanguage);
_ = ConfigHandler.SaveConfig(_config);
await ConfigHandler.SaveConfig(_config);
NoticeManager.Instance.Enqueue(ResUI.NeedRebootTips);
}
});