Merge pull request #3 from piti6/mkim/fix-undo

Fix undo was not working
piti6 · Feb 19, 2021 · 4279d47 · 4279d47
2 parents 418e7f2 + 8c2dee8
commit 4279d47
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/Scripts/InternalBridge/Data/CachedSkin.cs b/Scripts/InternalBridge/Data/CachedSkin.cs
@@ -34,6 +34,7 @@ public static bool Update(Skin skin)
             else
             {
                 instance._skin = skin;
+                EditorUtility.SetDirty(instance);
                 _dirty = true;
 
                 return true;

diff --git a/Scripts/InternalBridge/SkinEditorWindow/SkinEditorWindow.cs b/Scripts/InternalBridge/SkinEditorWindow/SkinEditorWindow.cs
@@ -42,7 +42,7 @@ private void OnEnable()
         {
             UpdateCurrentSkin(CachedSkin.Skin);
 
-            Undo.selectionUndoRedoPerformed += UndoRedoPerformed;
+            Undo.undoRedoPerformed += UndoRedoPerformed;
             _inspectedViewChunk.OnViewChanged += OnViewChanged;
 
             _skinMenuView.OnChangeName += OnChangeName;
@@ -235,7 +235,7 @@ private void UpdateCachedSkin(bool recordUndo)
         {
             if (recordUndo)
             {
-                Undo.RecordObject(CachedSkin.instance, "CachedSkin");
+                Undo.RegisterCreatedObjectUndo(CachedSkin.instance, "CachedSkin");
             }
 
             CachedSkin.Update(_currentSkin.ToImmutable(grantNewId: false));
@@ -298,11 +298,13 @@ private void OnSelectInspectionValue(object userdata, string[] options, int sele
             _inspectedViewChunk.ChangeInspectionValue(selected >= 0 ? selectableViews[selected] : null);
         }
 
-        private void UndoRedoPerformed(Undo.UndoRedoType obj)
+        private void UndoRedoPerformed()
         {
             UpdateCurrentSkin(CachedSkin.Skin);
 
             Repaint();
+
+            _inspectedViewChunk.InspectedView.Repaint();
         }
 
         private void UpdateCurrentSkin(Skin targetSkin)
@@ -347,7 +349,7 @@ private void OnDisable()
         {
             _highlighter.ClearHighlighters();
 
-            Undo.selectionUndoRedoPerformed -= UndoRedoPerformed;
+            Undo.undoRedoPerformed -= UndoRedoPerformed;
             _inspectedViewChunk.OnViewChanged -= OnViewChanged;
 
             _skinMenuView.OnChangeName -= OnChangeName;