UI - Fixed a lot of binding errors

UI - Added most missing DisposeWith calls

src/Artemis.UI/Screens/ProfileEditor/Panels/MenuBar/MenuBarViewModel.cs

@@ -22,7 +22,7 @@ public class MenuBarViewModel : ActivatableViewModelBase
         this.WhenActivated(d =>
         {
             profileEditorService.History.Subscribe(history => History = history).DisposeWith(d);
-            _profileConfiguration = profileEditorService.ProfileConfiguration.ToProperty(this, vm => vm.ProfileConfiguration);
+            _profileConfiguration = profileEditorService.ProfileConfiguration.ToProperty(this, vm => vm.ProfileConfiguration).DisposeWith(d);
             _isSuspended = profileEditorService.ProfileConfiguration
                 .Select(p => p?.WhenAnyValue(c => c.IsSuspended) ?? Observable.Never<bool>())
                 .Switch()

src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/ProfileTreeView.axaml

@@ -10,6 +10,15 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Artemis.UI.Screens.ProfileEditor.ProfileTree.ProfileTreeView"
              x:DataType="profileTree:ProfileTreeViewModel">
+	<!-- These cause binding errors, not my fault - https://github.com/AvaloniaUI/Avalonia/issues/5762 -->
+    <UserControl.KeyBindings>
+        <KeyBinding Gesture="Escape" Command="{Binding ClearSelection}" />
+        <KeyBinding Gesture="F2" Command="{Binding RenameSelected}" />
+        <KeyBinding Gesture="Delete" Command="{Binding DeleteSelected}" />
+        <KeyBinding Gesture="Ctrl+D" Command="{Binding DuplicateSelected}" />
+        <KeyBinding Gesture="Ctrl+C" Command="{Binding CopySelected}" />
+        <KeyBinding Gesture="Ctrl+V" Command="{Binding PasteSelected}" />
+    </UserControl.KeyBindings>
     <UserControl.Resources>
         <converters:ColorOpacityConverter x:Key="ColorOpacityConverter" />
     </UserControl.Resources>
@@ -55,7 +64,7 @@
             <Setter Property="Background">
                 <Setter.Value>
                     <LinearGradientBrush StartPoint="0,0" EndPoint="0,28">
-						<GradientStop Color="{StaticResource SystemAccentColorLight3}" Offset="0.0" />
+                        <GradientStop Color="{StaticResource SystemAccentColorLight3}" Offset="0.0" />
                         <GradientStop Color="{StaticResource SystemAccentColorLight3}" Offset="0.05" />
                         <GradientStop Color="{Binding Source={StaticResource SystemAccentColorLight3}, Converter={StaticResource ColorOpacityConverter}, ConverterParameter=0.25}" Offset="0.05" />
                         <GradientStop Color="{Binding Source={StaticResource SystemAccentColorLight3}, Converter={StaticResource ColorOpacityConverter}, ConverterParameter=0}" Offset="0.25" />
@@ -88,14 +97,6 @@
                     <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
                 </Style>
             </TreeView.Styles>
-            <TreeView.KeyBindings>
-                <KeyBinding Gesture="Escape" Command="{CompiledBinding ClearSelection}" />
-                <KeyBinding Gesture="F2" Command="{CompiledBinding SelectedChild.Rename}" />
-                <KeyBinding Gesture="Delete" Command="{CompiledBinding SelectedChild.Delete}" />
-                <KeyBinding Gesture="Ctrl+D" Command="{CompiledBinding SelectedChild.Duplicate}" />
-                <KeyBinding Gesture="Ctrl+C" Command="{CompiledBinding SelectedChild.Copy}" />
-                <KeyBinding Gesture="Ctrl+V" Command="{CompiledBinding SelectedChild.Paste}" />
-            </TreeView.KeyBindings>
             <TreeView.ItemTemplate>
                 <TreeDataTemplate ItemsSource="{Binding Children}">
                     <ContentControl Content="{Binding}" x:DataType="profileTree:TreeItemViewModel">

src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/ProfileTreeViewModel.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using System.Reactive;
 using System.Reactive.Disposables;
 using Artemis.Core;
 using Artemis.Core.Services;
@@ -11,87 +10,114 @@ using Artemis.UI.Shared.Services.Interfaces;
 using Artemis.UI.Shared.Services.ProfileEditor;
 using ReactiveUI;
 
-namespace Artemis.UI.Screens.ProfileEditor.ProfileTree
+namespace Artemis.UI.Screens.ProfileEditor.ProfileTree;
+
+public class ProfileTreeViewModel : TreeItemViewModel
 {
-    public class ProfileTreeViewModel : TreeItemViewModel
+    private readonly IProfileEditorService _profileEditorService;
+    private TreeItemViewModel? _selectedChild;
+
+    public ProfileTreeViewModel(IWindowService windowService,
+        IProfileEditorService profileEditorService,
+        ILayerBrushService layerBrushService,
+        IProfileEditorVmFactory profileEditorVmFactory,
+        IRgbService rgbService)
+        : base(null, null, windowService, profileEditorService, rgbService, layerBrushService, profileEditorVmFactory)
     {
-        private TreeItemViewModel? _selectedChild;
-
-        public ProfileTreeViewModel(IWindowService windowService,
-            IProfileEditorService profileEditorService,
-            ILayerBrushService layerBrushService,
-            IProfileEditorVmFactory profileEditorVmFactory,
-            IRgbService rgbService)
-            : base(null, null, windowService, profileEditorService, rgbService, layerBrushService, profileEditorVmFactory)
+        _profileEditorService = profileEditorService;
+        this.WhenActivated(d =>
         {
-            this.WhenActivated(d =>
+            profileEditorService.ProfileConfiguration.WhereNotNull().Subscribe(configuration =>
             {
-                profileEditorService.ProfileConfiguration.WhereNotNull().Subscribe(configuration =>
+                if (configuration.Profile == null)
                 {
-                    if (configuration.Profile == null)
-                    {
-                        windowService.ShowConfirmContentDialog("Failed to load profile", "It appears that this profile is corrupt and cannot be loaded. Please check your logs.", "Confirm", null);
-                        return;
-                    }
+                    windowService.ShowConfirmContentDialog("Failed to load profile", "It appears that this profile is corrupt and cannot be loaded. Please check your logs.", "Confirm", null);
+                    return;
+                }
 
-                    ProfileElement = configuration.Profile.GetRootFolder();
-                    SubscribeToProfileElement(d);
-                    CreateTreeItems();
-                }).DisposeWith(d);
+                ProfileElement = configuration.Profile.GetRootFolder();
+                SubscribeToProfileElement(d);
+                CreateTreeItems();
+            }).DisposeWith(d);
 
-                profileEditorService.ProfileElement.Subscribe(SelectCurrentProfileElement).DisposeWith(d);
-            });
+            profileEditorService.ProfileElement.Subscribe(SelectCurrentProfileElement).DisposeWith(d);
+        });
 
-            this.WhenAnyValue(vm => vm.SelectedChild).Subscribe(model =>
-            {
-                if (model?.ProfileElement is RenderProfileElement renderProfileElement)
-                    profileEditorService.ChangeCurrentProfileElement(renderProfileElement);
-            });
-
-            ClearSelection = ReactiveCommand.Create(() => profileEditorService.ChangeCurrentProfileElement(null));
-        }
-
-        public ReactiveCommand<Unit, Unit> ClearSelection { get; }
-
-        public TreeItemViewModel? SelectedChild
+        this.WhenAnyValue(vm => vm.SelectedChild).Subscribe(model =>
         {
-            get => _selectedChild;
-            set => RaiseAndSetIfChanged(ref _selectedChild, value);
-        }
+            if (model?.ProfileElement is RenderProfileElement renderProfileElement)
+                profileEditorService.ChangeCurrentProfileElement(renderProfileElement);
+        });
+    }
 
-        private void SelectCurrentProfileElement(RenderProfileElement? element)
+    public TreeItemViewModel? SelectedChild
+    {
+        get => _selectedChild;
+        set => RaiseAndSetIfChanged(ref _selectedChild, value);
+    }
+
+    public override bool SupportsChildren => true;
+
+    public void ClearSelection()
+    {
+        _profileEditorService.ChangeCurrentProfileElement(null);
+    }
+
+    public void RenameSelected()
+    {
+        SelectedChild?.Rename.Execute().Subscribe();
+    }
+
+    public void DeleteSelected()
+    {
+        SelectedChild?.Delete.Execute().Subscribe();
+    }
+
+    public void DuplicateSelected()
+    {
+        SelectedChild?.Duplicate.Execute().Subscribe();
+    }
+
+    public void CopySelected()
+    {
+        SelectedChild?.Copy.Execute().Subscribe();
+    }
+
+    public void PasteSelected()
+    {
+        SelectedChild?.Paste.Execute().Subscribe();
+    }
+
+    private void SelectCurrentProfileElement(RenderProfileElement? element)
+    {
+        if (SelectedChild?.ProfileElement == element)
+            return;
+
+        // Find the tree item belonging to the selected element
+        List<TreeItemViewModel> treeItems = GetAllTreeItems(Children);
+        TreeItemViewModel? selected = treeItems.FirstOrDefault(e => e.ProfileElement == element);
+
+        // Walk up the tree, expanding parents
+        TreeItemViewModel? currentParent = selected?.Parent;
+        while (currentParent != null)
         {
-            if (SelectedChild?.ProfileElement == element)
-                return;
-
-            // Find the tree item belonging to the selected element
-            List<TreeItemViewModel> treeItems = GetAllTreeItems(Children);
-            TreeItemViewModel? selected = treeItems.FirstOrDefault(e => e.ProfileElement == element);
-
-            // Walk up the tree, expanding parents
-            TreeItemViewModel? currentParent = selected?.Parent;
-            while (currentParent != null)
-            {
-                currentParent.IsExpanded = true;
-                currentParent = currentParent.Parent;
-            }
-
-            SelectedChild = selected;
+            currentParent.IsExpanded = true;
+            currentParent = currentParent.Parent;
         }
 
-        private List<TreeItemViewModel> GetAllTreeItems(ObservableCollection<TreeItemViewModel> treeItems)
+        SelectedChild = selected;
+    }
+
+    private List<TreeItemViewModel> GetAllTreeItems(ObservableCollection<TreeItemViewModel> treeItems)
+    {
+        List<TreeItemViewModel> result = new();
+        foreach (TreeItemViewModel treeItemViewModel in treeItems)
         {
-            List<TreeItemViewModel> result = new();
-            foreach (TreeItemViewModel treeItemViewModel in treeItems)
-            {
-                result.Add(treeItemViewModel);
-                if (treeItemViewModel.Children.Any())
-                    result.AddRange(GetAllTreeItems(treeItemViewModel.Children));
-            }
-
-            return result;
+            result.Add(treeItemViewModel);
+            if (treeItemViewModel.Children.Any())
+                result.AddRange(GetAllTreeItems(treeItemViewModel.Children));
         }
 
-        public override bool SupportsChildren => true;
+        return result;
     }
 }

src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/PropertiesViewModel.cs

@@ -57,7 +57,14 @@ public class PropertiesViewModel : ActivatableViewModelBase
         {
             _profileElement = profileEditorService.ProfileElement.ToProperty(this, vm => vm.ProfileElement).DisposeWith(d);
             _pixelsPerSecond = profileEditorService.PixelsPerSecond.ToProperty(this, vm => vm.PixelsPerSecond).DisposeWith(d);
-            Disposable.Create(() => _settingsService.SaveAllSettings()).DisposeWith(d);
+            Disposable.Create(() =>
+            {
+                _settingsService.SaveAllSettings();
+                foreach ((LayerPropertyGroup _, PropertyGroupViewModel value) in _cachedViewModels)
+                    value.Dispose();
+                _cachedViewModels.Clear();
+                
+            }).DisposeWith(d);
         });
         this.WhenAnyValue(vm => vm.ProfileElement).Subscribe(_ => UpdateGroups());
     }

src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelineGroupViewModel.cs

@@ -23,7 +23,7 @@ public class TimelineGroupViewModel : ActivatableViewModelBase
             {
                 _pixelsPerSecond = p;
                 UpdateKeyframePositions();
-            });
+            }).DisposeWith(d);
             this.WhenAnyValue(vm => vm.PropertyGroupViewModel.IsExpanded).Subscribe(_ => UpdateKeyframePositions()).DisposeWith(d);
             PropertyGroupViewModel.WhenAnyValue(vm => vm.IsExpanded).Subscribe(_ => this.RaisePropertyChanged(nameof(Children))).DisposeWith(d);
         });

src/Artemis.UI/Screens/ProfileEditor/Panels/StatusBar/StatusBarViewModel.cs

@@ -24,7 +24,7 @@ public class StatusBarViewModel : ActivatableViewModelBase
         {
             _profileElement = profileEditorService.ProfileElement.ToProperty(this, vm => vm.ProfileElement).DisposeWith(d);
             _history = profileEditorService.History.ToProperty(this, vm => vm.History).DisposeWith(d);
-            _pixelsPerSecond = profileEditorService.PixelsPerSecond.ToProperty(this, vm => vm.PixelsPerSecond);
+            _pixelsPerSecond = profileEditorService.PixelsPerSecond.ToProperty(this, vm => vm.PixelsPerSecond).DisposeWith(d);
         });
 
         this.WhenAnyValue(vm => vm.History)

src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml

@@ -9,6 +9,18 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Artemis.UI.Screens.ProfileEditor.VisualEditor.VisualEditorView"
              x:DataType="visualEditor:VisualEditorViewModel">
+    <UserControl.Resources>
+        <VisualBrush x:Key="LargeCheckerboardBrush" TileMode="Tile" Stretch="Uniform" SourceRect="0,0,20,20">
+            <VisualBrush.Visual>
+                <Canvas Width="20" Height="20">
+                    <Rectangle Width="10" Height="10" Fill="Black" Opacity="0.15" />
+                    <Rectangle Width="10" Height="10" Canvas.Left="10" />
+                    <Rectangle Width="10" Height="10" Canvas.Top="10" />
+                    <Rectangle Width="10" Height="10" Canvas.Left="10" Canvas.Top="10" Fill="Black" Opacity="0.15" />
+                </Canvas>
+            </VisualBrush.Visual>
+        </VisualBrush>
+	</UserControl.Resources>
     <Grid>
         <paz:ZoomBorder Name="ZoomBorder"
                         Stretch="None"
@@ -16,7 +28,7 @@
                         Focusable="True"
                         VerticalAlignment="Stretch"
                         HorizontalAlignment="Stretch"
-                        Background="{DynamicResource LargeCheckerboardBrush}"
+                        Background="{StaticResource LargeCheckerboardBrush}"
                         ZoomChanged="ZoomBorder_OnZoomChanged">
             <Grid Name="ContainerGrid"
                   Background="Transparent">

src/Artemis.UI/Screens/ProfileEditor/ProfileEditorTitleBarView.axaml.cs

@@ -19,7 +19,6 @@ namespace Artemis.UI.Screens.ProfileEditor
 
         private void MenuItem_OnSubmenuOpened(object? sender, RoutedEventArgs e)
         {
-            
         }
     }
-}
+}