DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-12 21:38:38 +00:00
Code Issues Releases Wiki Activity

Merge branch 'development' into feature/workshop

Browse Source
This commit is contained in:
Robert 2023-08-14 21:00:07 +02:00
commit 6014bb9e3c
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Artemis.UI/Screens/Sidebar/SidebarViewModel.cs
View File

@ -30,6 +30,7 @@ public class SidebarViewModel : ActivatableViewModelBase
private readonly IWindowService _windowService; private readonly IWindowService _windowService;
private ReadOnlyObservableCollection<SidebarCategoryViewModel> _sidebarCategories = new(new ObservableCollection<SidebarCategoryViewModel>()); private ReadOnlyObservableCollection<SidebarCategoryViewModel> _sidebarCategories = new(new ObservableCollection<SidebarCategoryViewModel>());
private SidebarScreenViewModel? _selectedScreen; private SidebarScreenViewModel? _selectedScreen;
private bool _updating;
public SidebarViewModel(IRouter router, IProfileService profileService, IWindowService windowService, ISidebarVmFactory sidebarVmFactory) public SidebarViewModel(IRouter router, IProfileService profileService, IWindowService windowService, ISidebarVmFactory sidebarVmFactory)
{ {
@ -57,7 +58,12 @@ public class SidebarViewModel : ActivatableViewModelBase
SourceList<ProfileCategory> profileCategories = new(); SourceList<ProfileCategory> profileCategories = new();
this.WhenActivated(d => this.WhenActivated(d =>
{ {
_router.CurrentPath.WhereNotNull().Subscribe(r => SelectedScreen = SidebarScreen.GetMatch(r)).DisposeWith(d); _router.CurrentPath.WhereNotNull().Subscribe(r =>
{
_updating = true;
SelectedScreen = SidebarScreen.GetMatch(r);
_updating = false;
}).DisposeWith(d);
Observable.FromEventPattern<ProfileCategoryEventArgs>(x => profileService.ProfileCategoryAdded += x, x => profileService.ProfileCategoryAdded -= x) Observable.FromEventPattern<ProfileCategoryEventArgs>(x => profileService.ProfileCategoryAdded += x, x => profileService.ProfileCategoryAdded -= x)
.Subscribe(e => profileCategories.Add(e.EventArgs.ProfileCategory)) .Subscribe(e => profileCategories.Add(e.EventArgs.ProfileCategory))
@ -115,6 +121,9 @@ public class SidebarViewModel : ActivatableViewModelBase
private void NavigateToScreen(SidebarScreenViewModel sidebarScreenViewModel) private void NavigateToScreen(SidebarScreenViewModel sidebarScreenViewModel)
{ {
if (_updating)
return;
Dispatcher.UIThread.Invoke(async () => Dispatcher.UIThread.Invoke(async () =>
{ {
try try