Profiles - Save folder open/closed state

Profiles editor - Save last selected element and reselect it
Profile editor - Save pan/zoom position
Profile editor - Added option to resume normal playback on focus loss

src/Artemis.Core/Models/Profile/Folder.cs

@@ -14,6 +14,8 @@ namespace Artemis.Core
     /// </summary>
     public sealed class Folder : RenderProfileElement
     {
+        private bool _isExpanded;
+
         /// <summary>
         ///     Creates a new instance of the <see cref="Folder" /> class and adds itself to the child collection of the provided
         ///     <paramref name="parent" />
@@ -46,6 +48,7 @@ namespace Artemis.Core
             Profile = profile;
             Parent = parent;
             Name = folderEntity.Name;
+            IsExpanded = folderEntity.IsExpanded;
             Suspended = folderEntity.Suspended;
             Order = folderEntity.Order;
 
@@ -57,6 +60,15 @@ namespace Artemis.Core
         /// </summary>
         public bool IsRootFolder => Parent == Profile;
 
+        /// <summary>
+        ///     Gets or sets a boolean indicating whether this folder is expanded
+        /// </summary>
+        public bool IsExpanded
+        {
+            get => _isExpanded;
+            set => SetAndNotify(ref _isExpanded, value);
+        }
+
         /// <summary>
         ///     Gets the folder entity this folder uses for persistent storage
         /// </summary>
@@ -72,8 +84,10 @@ namespace Artemis.Core
         {
             List<ILayerProperty> result = new();
             foreach (BaseLayerEffect layerEffect in LayerEffects)
+            {
                 if (layerEffect.BaseProperties != null)
                     result.AddRange(layerEffect.BaseProperties.GetAllLayerProperties());
+            }
 
             return result;
         }
@@ -151,27 +165,6 @@ namespace Artemis.Core
             return $"[Folder] {nameof(Name)}: {Name}, {nameof(Order)}: {Order}";
         }
 
-        internal void CalculateRenderProperties()
-        {
-            if (Disposed)
-                throw new ObjectDisposedException("Folder");
-
-            SKPath path = new() {FillType = SKPathFillType.Winding};
-            foreach (ProfileElement child in Children)
-            {
-                if (child is RenderProfileElement effectChild && effectChild.Path != null)
-                    path.AddPath(effectChild.Path);
-            }
-
-            Path = path;
-
-            // Folder render properties are based on child paths and thus require an update
-            if (Parent is Folder folder)
-                folder.CalculateRenderProperties();
-
-            OnRenderPropertiesUpdated();
-        }
-
         #region Rendering
 
         /// <inheritdoc />
@@ -209,7 +202,7 @@ namespace Artemis.Core
 
                     canvas.SaveLayer(layerPaint);
                     canvas.Translate(Bounds.Left - basePosition.X, Bounds.Top - basePosition.Y);
-                    
+
                     // Iterate the children in reverse because the first layer must be rendered last to end up on top
                     for (int index = Children.Count - 1; index > -1; index--)
                         Children[index].Render(canvas, new SKPointI(Bounds.Left, Bounds.Top));
@@ -229,57 +222,6 @@ namespace Artemis.Core
 
         #endregion
 
-        /// <inheritdoc />
-        protected override void Dispose(bool disposing)
-        {
-            Disposed = true;
-
-            Disable();
-            foreach (ProfileElement profileElement in Children)
-                profileElement.Dispose();
-
-            base.Dispose(disposing);
-        }
-
-        internal override void Load()
-        {
-            ExpandedPropertyGroups.AddRange(FolderEntity.ExpandedPropertyGroups);
-            Reset();
-
-            // Load child folders
-            foreach (FolderEntity childFolder in Profile.ProfileEntity.Folders.Where(f => f.ParentId == EntityId))
-                ChildrenList.Add(new Folder(Profile, this, childFolder));
-            // Load child layers
-            foreach (LayerEntity childLayer in Profile.ProfileEntity.Layers.Where(f => f.ParentId == EntityId))
-                ChildrenList.Add(new Layer(Profile, this, childLayer));
-
-            // Ensure order integrity, should be unnecessary but no one is perfect specially me
-            ChildrenList = ChildrenList.OrderBy(c => c.Order).ToList();
-            for (int index = 0; index < ChildrenList.Count; index++)
-                ChildrenList[index].Order = index + 1;
-
-            LoadRenderElement();
-        }
-
-        internal override void Save()
-        {
-            if (Disposed)
-                throw new ObjectDisposedException("Folder");
-
-            FolderEntity.Id = EntityId;
-            FolderEntity.ParentId = Parent?.EntityId ?? new Guid();
-
-            FolderEntity.Order = Order;
-            FolderEntity.Name = Name;
-            FolderEntity.Suspended = Suspended;
-
-            FolderEntity.ProfileId = Profile.EntityId;
-            FolderEntity.ExpandedPropertyGroups.Clear();
-            FolderEntity.ExpandedPropertyGroups.AddRange(ExpandedPropertyGroups);
-
-            SaveRenderElement();
-        }
-
         /// <inheritdoc />
         public override void Enable()
         {
@@ -320,18 +262,87 @@ namespace Artemis.Core
             Enabled = false;
         }
 
-        #region Events
-
         /// <summary>
         ///     Occurs when a property affecting the rendering properties of this folder has been updated
         /// </summary>
         public event EventHandler? RenderPropertiesUpdated;
 
+        /// <inheritdoc />
+        protected override void Dispose(bool disposing)
+        {
+            Disposed = true;
+
+            Disable();
+            foreach (ProfileElement profileElement in Children)
+                profileElement.Dispose();
+
+            base.Dispose(disposing);
+        }
+
+        internal void CalculateRenderProperties()
+        {
+            if (Disposed)
+                throw new ObjectDisposedException("Folder");
+
+            SKPath path = new() {FillType = SKPathFillType.Winding};
+            foreach (ProfileElement child in Children)
+            {
+                if (child is RenderProfileElement effectChild && effectChild.Path != null)
+                    path.AddPath(effectChild.Path);
+            }
+
+            Path = path;
+
+            // Folder render properties are based on child paths and thus require an update
+            if (Parent is Folder folder)
+                folder.CalculateRenderProperties();
+
+            OnRenderPropertiesUpdated();
+        }
+
+        internal override void Load()
+        {
+            ExpandedPropertyGroups.AddRange(FolderEntity.ExpandedPropertyGroups);
+            Reset();
+
+            // Load child folders
+            foreach (FolderEntity childFolder in Profile.ProfileEntity.Folders.Where(f => f.ParentId == EntityId))
+                ChildrenList.Add(new Folder(Profile, this, childFolder));
+            // Load child layers
+            foreach (LayerEntity childLayer in Profile.ProfileEntity.Layers.Where(f => f.ParentId == EntityId))
+                ChildrenList.Add(new Layer(Profile, this, childLayer));
+
+            // Ensure order integrity, should be unnecessary but no one is perfect specially me
+            ChildrenList = ChildrenList.OrderBy(c => c.Order).ToList();
+            for (int index = 0; index < ChildrenList.Count; index++)
+                ChildrenList[index].Order = index + 1;
+
+            LoadRenderElement();
+        }
+
+        internal override void Save()
+        {
+            if (Disposed)
+                throw new ObjectDisposedException("Folder");
+
+            FolderEntity.Id = EntityId;
+            FolderEntity.ParentId = Parent?.EntityId ?? new Guid();
+
+            FolderEntity.Order = Order;
+            FolderEntity.Name = Name;
+            FolderEntity.IsExpanded = IsExpanded;
+            FolderEntity.Suspended = Suspended;
+
+            FolderEntity.ProfileId = Profile.EntityId;
+            FolderEntity.ExpandedPropertyGroups.Clear();
+            FolderEntity.ExpandedPropertyGroups.AddRange(ExpandedPropertyGroups);
+
+            SaveRenderElement();
+        }
+
         private void OnRenderPropertiesUpdated()
         {
             RenderPropertiesUpdated?.Invoke(this, EventArgs.Empty);
         }
-
-        #endregion
     }
 }

src/Artemis.Core/Models/Profile/Profile.cs

@@ -14,6 +14,7 @@ namespace Artemis.Core
     {
         private readonly object _lock = new();
         private bool _isFreshImport;
+        private ProfileElement? _lastSelectedProfileElement;
 
         internal Profile(ProfileConfiguration configuration, ProfileEntity profileEntity) : base(null!)
         {
@@ -60,6 +61,15 @@ namespace Artemis.Core
             set => SetAndNotify(ref _isFreshImport, value);
         }
 
+        /// <summary>
+        ///     Gets or sets the last selected profile element of this profile
+        /// </summary>
+        public ProfileElement? LastSelectedProfileElement
+        {
+            get => _lastSelectedProfileElement;
+            set => SetAndNotify(ref _lastSelectedProfileElement, value);
+        }
+
         /// <summary>
         ///     Gets the profile entity this profile uses for persistent storage
         /// </summary>
@@ -187,6 +197,15 @@ namespace Artemis.Core
                 }
             }
 
+            if (ProfileEntity.LastSelectedProfileElement != Guid.Empty)
+            {
+                LastSelectedProfileElement = GetAllFolders().FirstOrDefault(f => f.EntityId == ProfileEntity.LastSelectedProfileElement);
+                if (LastSelectedProfileElement == null)
+                    LastSelectedProfileElement = GetAllLayers().FirstOrDefault(f => f.EntityId == ProfileEntity.LastSelectedProfileElement);
+            }
+            else
+                LastSelectedProfileElement = null;
+
             foreach (ScriptConfiguration scriptConfiguration in ScriptConfigurations)
                 scriptConfiguration.Script?.Dispose();
             ScriptConfigurations.Clear();
@@ -201,6 +220,7 @@ namespace Artemis.Core
             ProfileEntity.Id = EntityId;
             ProfileEntity.Name = Configuration.Name;
             ProfileEntity.IsFreshImport = IsFreshImport;
+            ProfileEntity.LastSelectedProfileElement = LastSelectedProfileElement?.EntityId ?? Guid.Empty;
 
             foreach (ProfileElement profileElement in Children)
                 profileElement.Save();

src/Artemis.Core/Models/ProfileConfiguration/ProfileConfiguration.cs

@@ -179,7 +179,8 @@ namespace Artemis.Core
         {
             if (_disposed)
                 throw new ObjectDisposedException("ProfileConfiguration");
-
+            if (IsBeingEdited)
+                return true;
             if (Category.IsSuspended || IsSuspended || IsMissingModule)
                 return false;
 

src/Artemis.Core/Services/Storage/ProfileService.cs

@@ -209,7 +209,7 @@ namespace Artemis.Core.Services
                         ProcessPendingKeyEvents(profileConfiguration);
 
                         // Profiles being edited are updated at their own leisure
-                        if (profileConfiguration.IsBeingEdited)
+                        if (profileConfiguration.IsBeingEdited && RenderForEditor)
                             continue;
 
                         bool shouldBeActive = profileConfiguration.ShouldBeActive(false);
@@ -254,11 +254,9 @@ namespace Artemis.Core.Services
                         try
                         {
                             ProfileConfiguration profileConfiguration = profileCategory.ProfileConfigurations[j];
-                            if (RenderForEditor)
-                            {
-                                if (profileConfiguration.IsBeingEdited)
-                                    profileConfiguration.Profile?.Render(canvas, SKPointI.Empty);
-                            }
+                            // Always render profiles being edited
+                            if (profileConfiguration.IsBeingEdited)
+                                profileConfiguration.Profile?.Render(canvas, SKPointI.Empty);
                             else
                             {
                                 // Ensure all criteria are met before rendering