Add change deferrals

Author: keveleigh

org.mixedrealitytoolkit.uxcore/Editor/Inspectors/FontIconSet/FontIconSetInspector.cs

@@ -43,6 +43,12 @@ public class FontIconSetInspector : UnityEditor.Editor
         private string[] availableNamesArray = Array.Empty<string>();
         private bool requiresUpdate = false;
 
+        // Deferred State Variables
+        private uint? pendingIconToAdd = null;
+        private string pendingIconToRemove = null;
+        private string pendingIconToRenameOld = null;
+        private string pendingIconToRenameNew = null;
+
         /// <summary>
         /// A Unity event function that is called when the script component has been enabled.
         /// </summary>
@@ -127,10 +133,30 @@ private void UpdateIconEntries()
         /// </summary>
         public override void OnInspectorGUI()
         {
-            if (requiresUpdate && Event.current.type == EventType.Layout)
+            if (Event.current.type == EventType.Layout)
             {
-                UpdateIconEntries();
-                requiresUpdate = false;
+                if (pendingIconToAdd.HasValue)
+                {
+                    AddIcon((FontIconSet)target, pendingIconToAdd.Value);
+                    pendingIconToAdd = null;
+                }
+                if (pendingIconToRemove != null)
+                {
+                    RemoveIcon((FontIconSet)target, pendingIconToRemove);
+                    pendingIconToRemove = null;
+                }
+                if (pendingIconToRenameOld != null && pendingIconToRenameNew != null)
+                {
+                    UpdateIconName((FontIconSet)target, pendingIconToRenameOld, pendingIconToRenameNew);
+                    pendingIconToRenameOld = null;
+                    pendingIconToRenameNew = null;
+                }
+
+                if (requiresUpdate)
+                {
+                    UpdateIconEntries();
+                    requiresUpdate = false;
+                }
             }
 
             bool showGlyphIconFoldout = SessionState.GetBool(ShowGlyphIconsFoldoutKey, false);
@@ -148,8 +174,7 @@ public override void OnInspectorGUI()
                 if (EditorGUI.EndChangeCheck())
                 {
                     serializedObject.ApplyModifiedProperties();
-                    UpdateIconEntries();
-                    GUIUtility.ExitGUI();
+                    requiresUpdate = true;
                 }
 
                 if (iconFontAssetProp.objectReferenceValue == null)
@@ -227,14 +252,11 @@ public override void OnInspectorGUI()
                                 // Catch edge cases where the external asset size changes while this inspector is still focused
                                 if (setDefinition.IconNames != null && validNames.Count != setDefinition.IconNames.Count)
                                 {
-                                    UpdateIconEntries();
-                                    GUIUtility.ExitGUI();
+                                    requiresUpdate = true;
                                 }
                             }
 
                             int column = 0;
-                            string iconToRemove = null;
-                            string iconToRename = null;
                             EditorGUILayout.BeginHorizontal();
                             foreach (KeyValuePair<uint, string> iconEntry in iconEntries)
                             {
@@ -251,7 +273,7 @@ public override void OnInspectorGUI()
                                     GUILayout.Height(ButtonDimension),
                                     GUILayout.MaxWidth(ButtonDimension)))
                                 {
-                                    iconToRemove = iconEntry.Value;
+                                    pendingIconToRemove = iconEntry.Value;
                                 }
 
                                 Rect textureRect = GUILayoutUtility.GetLastRect();
@@ -275,8 +297,8 @@ public override void OnInspectorGUI()
                                         int selected = EditorGUILayout.Popup(string.Empty, 0, availableNamesArray, GUILayout.MaxWidth(ButtonDimension));
                                         if (check.changed)
                                         {
-                                            iconToRename = availableNamesArray[selected];
-                                            iconToRemove = iconEntry.Value;
+                                            pendingIconToRenameNew = availableNamesArray[selected];
+                                            pendingIconToRenameOld = iconEntry.Value;
                                         }
                                         GUI.backgroundColor = oldColor;
                                     }
@@ -286,26 +308,15 @@ public override void OnInspectorGUI()
                                     string currentName = EditorGUILayout.TextField(iconEntry.Value);
                                     if (currentName != iconEntry.Value)
                                     {
-                                        iconToRename = currentName;
-                                        iconToRemove = iconEntry.Value;
+                                        pendingIconToRenameNew = currentName;
+                                        pendingIconToRenameOld = iconEntry.Value;
                                     }
                                 }
                                 EditorGUILayout.EndVertical();
 
                                 column++;
                             }
                             EditorGUILayout.EndHorizontal();
-
-                            if (iconToRename != null)
-                            {
-                                UpdateIconName(fontIconSet, iconToRemove, iconToRename);
-                                GUIUtility.ExitGUI();
-                            }
-                            else if (iconToRemove != null)
-                            {
-                                RemoveIcon(fontIconSet, iconToRemove);
-                                GUIUtility.ExitGUI();
-                            }
                         }
                         else
                         {
@@ -330,7 +341,7 @@ public override void OnInspectorGUI()
         [Obsolete("This method has been deprecated in version 4.0 and will be removed in a future version.")]
         public void DrawFontGlyphsGrid(FontIconSet fontIconSet, int maxButtonsPerColumn)
         {
-            DrawFontGlyphsGrid(fontIconSet.IconFontAsset, fontIconSet, maxButtonsPerColumn);
+            DrawFontGlyphsGrid(fontIconSet.IconFontAsset, maxButtonsPerColumn);
         }
 
         /// <summary>
@@ -339,10 +350,9 @@ public void DrawFontGlyphsGrid(FontIconSet fontIconSet, int maxButtonsPerColumn)
         /// <param name="fontAsset">The font asset containing the glyphs.</param>
         /// <param name="fontIconSet">The set of font glyphs to draw.</param>
         /// <param name="maxButtonsPerColumn">The number of buttons per column.</param>
-        private void DrawFontGlyphsGrid(TMP_FontAsset fontAsset, FontIconSet fontIconSet, int maxButtonsPerColumn)
+        private void DrawFontGlyphsGrid(TMP_FontAsset fontAsset, int maxButtonsPerColumn)
         {
             int column = 0;
-            bool iconAdded = false;
             EditorGUILayout.BeginHorizontal();
             for (int i = 0; i < fontAsset.characterTable.Count; i++)
             {
@@ -359,8 +369,7 @@ private void DrawFontGlyphsGrid(TMP_FontAsset fontAsset, FontIconSet fontIconSet
                         GUILayout.Height(ButtonDimension),
                         GUILayout.MaxWidth(ButtonDimension)))
                     {
-                        AddIcon(fontIconSet, fontAsset.characterTable[i].unicode);
-                        iconAdded = true;
+                        pendingIconToAdd = fontAsset.characterTable[i].unicode;
                     }
 
                     Rect textureRect = GUILayoutUtility.GetLastRect();
@@ -369,19 +378,9 @@ private void DrawFontGlyphsGrid(TMP_FontAsset fontAsset, FontIconSet fontIconSet
                     EditorDrawTMPGlyph(textureRect, fontAsset, fontAsset.characterTable[i]);
                 }
 
-                if (iconAdded)
-                {
-                    break;
-                }
-
                 column++;
             }
             EditorGUILayout.EndHorizontal();
-
-            if (iconAdded)
-            {
-                GUIUtility.ExitGUI();
-            }
         }
 
         private bool AddIcon(FontIconSet fontIconSet, uint unicodeValue)