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

UI - Fix double registration of default UI types

Browse Source
This commit is contained in:
Robert 2021-08-20 00:14:11 +02:00
parent c6a73f01f0
commit 3ed3cd1b1e
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Artemis.UI/Screens/RootViewModel.cs
View File

@ -32,11 +32,12 @@ namespace Artemis.UI.Screens
private readonly IWindowManager _windowManager; private readonly IWindowManager _windowManager;
private readonly PluginSetting<WindowSize> _windowSize; private readonly PluginSetting<WindowSize> _windowSize;
private static bool _registeredBuiltInTypes;
private bool _lostFocus; private bool _lostFocus;
private ISnackbarMessageQueue _mainMessageQueue; private ISnackbarMessageQueue _mainMessageQueue;
private MaterialWindow _window; private MaterialWindow _window;
private string _windowTitle; private string _windowTitle;
public RootViewModel( public RootViewModel(
IKernel kernel, IKernel kernel,
IEventAggregator eventAggregator, IEventAggregator eventAggregator,
@ -169,10 +170,14 @@ namespace Artemis.UI.Screens
SidebarViewModel.SelectedScreenChanged += SidebarViewModelOnSelectedScreenChanged; SidebarViewModel.SelectedScreenChanged += SidebarViewModelOnSelectedScreenChanged;
ActiveItem = SidebarViewModel.SelectedScreen; ActiveItem = SidebarViewModel.SelectedScreen;
_builtInRegistrationService.RegisterBuiltInDataModelDisplays(); if (!_registeredBuiltInTypes)
_builtInRegistrationService.RegisterBuiltInDataModelInputs(); {
_builtInRegistrationService.RegisterBuiltInPropertyEditors(); _builtInRegistrationService.RegisterBuiltInDataModelDisplays();
_builtInRegistrationService.RegisterBuiltInNodeTypes(); _builtInRegistrationService.RegisterBuiltInDataModelInputs();
_builtInRegistrationService.RegisterBuiltInPropertyEditors();
_builtInRegistrationService.RegisterBuiltInNodeTypes();
_registeredBuiltInTypes = true;
}
_window = (MaterialWindow) View; _window = (MaterialWindow) View;