[Sprite Editor] - Fixed bug where opening a new sprite, while already…

… having a sprite open, would cause the editor to stop responding to sprite clipping, picking and vertex editing changes.
Tape-Worm · Feb 18, 2022 · 1cdc672 · 1cdc672
1 parent 60898d2
commit 1cdc672
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 6 deletions.
diff --git a/PlugIns/Gorgon.Editor.SpriteEditor/_Internal/Forms/FormRibbon.cs b/PlugIns/Gorgon.Editor.SpriteEditor/_Internal/Forms/FormRibbon.cs
@@ -212,6 +212,25 @@ private void SpriteClipContext_PropertyChanged(object sender, PropertyChangedEve
             ValidateButtons();
         }
 
+        /// <summary>Handles the PropertyChanging event of the DataContext control.</summary>
+        /// <param name="sender">The source of the event.</param>
+        /// <param name="e">The <see cref="PropertyChangingEventArgs" /> instance containing the event data.</param>
+        private void DataContext_PropertyChanging(object sender, PropertyChangingEventArgs e)
+        {
+            switch (e.PropertyName)
+            {
+                case nameof(ISpriteContent.SpriteClipContext):
+                    DataContext.SpriteClipContext.PropertyChanged -= SpriteClipContext_PropertyChanged;
+                    break;
+                case nameof(ISpriteContent.SpritePickContext):
+                    DataContext.SpriteClipContext.PropertyChanged -= SpritePickContext_PropertyChanged;
+                    break;
+                case nameof(ISpriteContent.SpriteVertexEditContext):
+                    DataContext.SpriteVertexEditContext.PropertyChanged -= SpriteVertexEditorContext_PropertyChanged;
+                    break;
+            }
+        }
+
         /// <summary>Handles the PropertyChanged event of the DataContext control.</summary>
         /// <param name="sender">The source of the event.</param>
         /// <param name="e">The [PropertyChangedEventArgs] instance containing the event data.</param>
@@ -230,6 +249,15 @@ private void DataContext_PropertyChanged(object sender, PropertyChangedEventArgs
                     NumericFixedWidth.Maximum = DataContext?.Texture?.Width ?? 16384;
                     NumericFixedHeight.Maximum = DataContext?.Texture?.Height ?? 16384;
                     break;
+                case nameof(ISpriteContent.SpriteClipContext):
+                    DataContext.SpriteClipContext.PropertyChanged += SpriteClipContext_PropertyChanged;
+                    break;
+                case nameof(ISpriteContent.SpritePickContext):
+                    DataContext.SpriteClipContext.PropertyChanged += SpritePickContext_PropertyChanged;
+                    break;
+                case nameof(ISpriteContent.SpriteVertexEditContext):
+                    DataContext.SpriteVertexEditContext.PropertyChanged += SpriteVertexEditorContext_PropertyChanged;
+                    break;
             }
 
             ValidateButtons();
@@ -678,6 +706,7 @@ private void UnassignEvents()
                 DataContext.SpriteVertexEditContext.PropertyChanged -= SpriteVertexEditorContext_PropertyChanged;
             }
 
+            DataContext.PropertyChanging -= DataContext_PropertyChanging;
             DataContext.PropertyChanged -= DataContext_PropertyChanged;
         }
 
@@ -845,7 +874,8 @@ public void SetDataContext(ISpriteContent dataContext)
             }
 
             DataContext.PropertyChanged += DataContext_PropertyChanged;
-        }        
+            DataContext.PropertyChanging += DataContext_PropertyChanging;
+        }
 
         /// <summary>
         /// Function to validate the state of the buttons.

diff --git a/PlugIns/Gorgon.Editor.SpriteEditor/_Internal/ViewModels/SpriteContent.cs b/PlugIns/Gorgon.Editor.SpriteEditor/_Internal/ViewModels/SpriteContent.cs
@@ -1674,6 +1674,10 @@ public void Initialize(GorgonSprite sprite, IContentFile file, IUndoService undo
             SpritePickContext = spritePickContext;
             SpriteVertexEditContext = spriteVertexEditContext;
 
+            SpriteClipContext.ApplyCommand = new EditorCommand<object>(DoApplyClip, CanApplyClip);
+            SpritePickContext.ApplyCommand = new EditorCommand<object>(DoApplyPick, CanApplyPick);
+            SpriteVertexEditContext.ApplyCommand = new EditorCommand<object>(DoCommitVertexOffsets, CanCommitVertexOffsets);
+
             NotifyAllPropertiesChanged();
         }
 

diff --git a/PlugIns/Gorgon.Editor.SpriteEditor/_Internal/Views/SpriteEditorView.cs b/PlugIns/Gorgon.Editor.SpriteEditor/_Internal/Views/SpriteEditorView.cs
@@ -609,14 +609,11 @@ protected override void OnPropertyChanged(string propertyName)
                     break;
                 case nameof(ISpriteContent.SpriteClipContext):
                     _manualRectEditor.SetDataContext(DataContext.SpriteClipContext);
-                    //DataContext.SpriteClipContext.PropertyChanged += SpriteClipContext_PropertyChanged;                    
+                    DataContext.SpriteClipContext.PropertyChanged += SpriteClipContext_PropertyChanged;                    
                     break;
                 case nameof(ISpriteContent.SpritePickContext):
                     SpritePickMaskColor.SetDataContext(DataContext.SpritePickContext.SpritePickMaskEditor);
-                    //DataContext.SpritePickContext.PropertyChanged += SpritePickContext_PropertyChanged;
-                    break;
-                case nameof(ISpriteContent.SpriteVertexEditContext):
-                    //_manualVertexEditor.SetDataContext(DataContext.SpriteVertexEditContext);
+                    DataContext.SpritePickContext.PropertyChanged += SpritePickContext_PropertyChanged;
                     break;
             }