review:

- Add a link/unlink icon to the right of the name field. - Only show the rich text preview when there is the character '<' in the label field. - Toggling link from ON to OFF will set the label to the current GameObject name.
bdunderscore · Sep 3, 2024 · 3622606 · 3622606
1 parent b7441dd
commit 3622606
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 17 deletions.
diff --git a/Editor/Inspector/Menu/MenuItemGUI.cs b/Editor/Inspector/Menu/MenuItemGUI.cs
@@ -220,6 +220,8 @@ public void DoGUI()
             EditorGUILayout.BeginHorizontal();
 
             EditorGUILayout.BeginVertical();
+
+            EditorGUILayout.BeginHorizontal();
             var needsRichLabel = (!string.IsNullOrEmpty(_prop_label.stringValue) || _isTryingRichLabel);
             if (!needsRichLabel)
             {
@@ -234,8 +236,24 @@ public void DoGUI()
             {
                 EditorGUILayout.PropertyField(_prop_label, G("menuitem.prop.name"));
             }
+            var linkIcon = EditorGUIUtility.IconContent(needsRichLabel ? "UnLinked" : "Linked").image;
+            var guiIcon = new GUIContent(linkIcon, S(needsRichLabel ? "menuitem.rich_text.toggle_off.tooltip" : "menuitem.rich_text.toggle_on.tooltip"));
+            if (GUILayout.Button(guiIcon, GUILayout.Height(EditorGUIUtility.singleLineHeight), GUILayout.Width(25)))
+            {
+                if (!needsRichLabel)
+                {
+                    _isTryingRichLabel = true;
+                    _prop_label.stringValue = _name.stringValue;
+                }
+                else
+                {
+                    _isTryingRichLabel = false;
+                    _prop_label.stringValue = "";
+                }
+            }
+            EditorGUILayout.EndHorizontal();
 
-            if (needsRichLabel)
+            if (needsRichLabel && _prop_label.stringValue.Contains("<"))
             {
                 var style = new GUIStyle(EditorStyles.textField);
                 style.richText = true;
@@ -326,20 +344,6 @@ public void DoGUI()
 
             EditorGUILayout.EndHorizontal();
 
-            var newRichValue = EditorGUILayout.Toggle(G("menuitem.prop.rich_text"), needsRichLabel);
-            if (newRichValue != needsRichLabel)
-            {
-                if (newRichValue)
-                {
-                    _isTryingRichLabel = true;
-                }
-                else
-                {
-                    _isTryingRichLabel = false;
-                    _prop_label.stringValue = "";
-                }
-            }
-
             EditorGUILayout.EndVertical();
 
             if (_texture != null)

diff --git a/Editor/Localization/en-US.json b/Editor/Localization/en-US.json
@@ -253,6 +253,6 @@
   "reactive_object.material-setter.set-to": "Set material to: ",
   "reactive_object.shape-changer.target-renderer": "Target Renderer",
   "menuitem.misc.add_toggle": "Add toggle",
-  "menuitem.prop.rich_text": "Rich text",
-  "menuitem.prop.rich_text.tooltip": "Use a long name which may contain rich text and line breaks."
+  "menuitem.rich_text.toggle_on.tooltip": "Use a long name which may contain rich text and line breaks.",
+  "menuitem.rich_text.toggle_off.tooltip": "Use the GameObject name."
 }