stash

Author: keveleigh

org.mixedrealitytoolkit.standardassets/Fonts/Selawik-Semibold-MRTKIcons.asset

@@ -104,8 +104,6 @@ MonoBehaviour:
       value: 60390
     - key: Icon 26
       value: 60227
-    - key: Icon 25
-      value: 59977
     - key: Icon 24
       value: 59846
     - key: Icon 23
@@ -148,8 +146,6 @@ MonoBehaviour:
       value: 62982
     - key: Play Circle
       value: 62984
-    - key: Brightness
-      value: 59456
     - key: Unpin
       value: 62980
     - key: Pin
@@ -196,16 +192,12 @@ MonoBehaviour:
       value: 59512
     - key: Movie
       value: 62810
-    - key: Thumb Up
-      value: 63518
     - key: Location On
       value: 62713
     - key: Refresh
       value: 61758
     - key: Location Off
       value: 59523
-    - key: Thumb Down
-      value: 63520
     - key: Videocam
       value: 63565
     - key: Undo
@@ -296,6 +288,16 @@ MonoBehaviour:
       value: 62318
     - key: Cut
       value: 62267
+    - key: Icon 62700
+      value: 62700
+    - key: Thumb Down
+      value: 63518
+    - key: Thumb Up
+      value: 63520
+    - key: Brightness
+      value: 59456
+    - key: Save As
+      value: 59977
   iconFontAsset: {fileID: 11400000, guid: 533bdd8d5c92b52448ee2ecf7bd828a4, type: 2}
   optionalEditorMaterial: {fileID: 0}
   fontIconSetDefinition: {fileID: 11400000, guid: e63daff880b56ed439a2e852b6e6993a, type: 2}

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

@@ -39,6 +39,8 @@ private void OnEnable()
         /// </summary>
         public override void OnInspectorGUI()
         {
+            serializedObject.Update();
+
             if (!initializedStyle)
             {
                 currentButtonStyle = new GUIStyle(GUI.skin.button);
@@ -57,6 +59,9 @@ public override void OnInspectorGUI()
             EditorGUILayout.PropertyField(tmProProp);
             EditorGUILayout.Space();
 
+            EditorGUILayout.PropertyField(serializedObject.FindProperty("migratedSuccessfully"));
+            EditorGUILayout.Space();
+
             if (fontIconsProp.objectReferenceValue == null)
             {
                 EditorGUILayout.HelpBox(noFontIconsMessage, MessageType.Warning);

org.mixedrealitytoolkit.uxcore/FontIcons/FontIconSelector.cs

@@ -66,6 +66,7 @@ private void Awake()
             {
                 textMeshProComponent = GetComponent<TMP_Text>();
             }
+            TryMigrate();
             SetIcon(currentIconName);
         }
 
@@ -74,6 +75,7 @@ private void Awake()
         /// </summary>
         private void OnValidate()
         {
+            //TryMigrate();
             SetIcon(currentIconName);
         }
 
@@ -95,27 +97,50 @@ private void SetIcon(string newIconName)
             }
         }
 
-        void ISerializationCallbackReceiver.OnBeforeSerialize() { }
-
-        void ISerializationCallbackReceiver.OnAfterDeserialize()
+        private void TryMigrate()
         {
+            uint unicodeValue1 = FontIconSet.ConvertHexStringToUnicode(textMeshProComponent.text);
+            Debug.Log($"============================================={unicodeValue1} | {migratedSuccessfully} | {currentIconName}");
+
             if (!migratedSuccessfully && fontIcons != null && fontIcons.FontIconSetDefinition != null && textMeshProComponent != null)
             {
                 uint unicodeValue = FontIconSet.ConvertHexStringToUnicode(textMeshProComponent.text);
+
+                if (currentIconName == "Icon 4")
+                {
+                    Debug.Log($"============================================={unicodeValue}");
+                }
+
                 foreach (KeyValuePair<string, uint> kv in fontIcons.GlyphIconsByName)
                 {
+
+
                     if (kv.Value == unicodeValue)
                     {
                         if (currentIconName != kv.Key)
                         {
                             Debug.Log($"[{nameof(FontIconSelector)}] Successfully migrated icon: \"{currentIconName}\" to \"{kv.Key}\"", this);
-                            currentIconName = kv.Key;
+                            CurrentIconName = kv.Key;
                             migratedSuccessfully = true;
                         }
+                        else
+                        {
+                            Debug.Log($"[{nameof(FontIconSelector)}] Tried to migrate icon: \"{unicodeValue}\" | \"{currentIconName}\"", this);
+                        }
                         break;
                     }
                 }
             }
         }
+
+        void ISerializationCallbackReceiver.OnBeforeSerialize()
+        {
+            TryMigrate();
+        }
+
+        void ISerializationCallbackReceiver.OnAfterDeserialize()
+        {
+            TryMigrate();
+        }
     }
 }