[Port] [6000.4] Fix a number of ShaderGraph UI/UX bugs

svc-reach-platform-support · Evergreen · commit 5214ffe82ae6 · 2026-02-20T18:28:38.000Z
diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/RedirectNodeView.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/RedirectNodeView.cs
@@ -141,8 +141,7 @@ public bool FindPort(SlotReference slot, out ShaderPort port)
         public void AttachMessage(string errString, ShaderCompilerMessageSeverity severity)
         {
             ClearMessage();
-            IconBadge badge;
-            badge = IconBadge.CreateComment(errString);
+            IconBadge badge = InternalBridge.IconBadge.CreateComment(errString);
 
             Add(badge);
             badge.AttachTo(outputContainer, SpriteAlignment.RightCenter);
diff --git a/Packages/com.unity.shadergraph/Editor/Drawing/Views/MaterialNodeView.cs b/Packages/com.unity.shadergraph/Editor/Drawing/Views/MaterialNodeView.cs
@@ -195,11 +195,11 @@ public void AttachMessage(string errString, ShaderCompilerMessageSeverity severi
             IconBadge badge;
             if (severity == ShaderCompilerMessageSeverity.Error)
             {
-                badge = IconBadge.CreateError(errString);
+                badge = InternalBridge.IconBadge.CreateError(errString);
             }
             else
             {
-                badge = IconBadge.CreateComment(errString);
+                badge = InternalBridge.IconBadge.CreateComment(errString);
             }
 
             Add(badge);
diff --git a/Packages/com.unity.shadergraph/Editor/Drawing/Views/PropertyNodeView.cs b/Packages/com.unity.shadergraph/Editor/Drawing/Views/PropertyNodeView.cs
@@ -326,11 +326,11 @@ public void AttachMessage(string errString, ShaderCompilerMessageSeverity severi
             IconBadge badge;
             if (severity == ShaderCompilerMessageSeverity.Error)
             {
-                badge = IconBadge.CreateError(errString);
+                badge = InternalBridge.IconBadge.CreateError(errString);
             }
             else
             {
-                badge = IconBadge.CreateComment(errString);
+                badge = InternalBridge.IconBadge.CreateComment(errString);
             }
 
             Add(badge);
diff --git a/Packages/com.unity.shadergraph/Editor/InternalBridge/IconBadge.cs b/Packages/com.unity.shadergraph/Editor/InternalBridge/IconBadge.cs
@@ -0,0 +1,24 @@
+using GraphViewIconBadge = UnityEditor.Experimental.GraphView.IconBadge;
+
+namespace UnityEditor.ShaderGraph.InternalBridge
+{
+    // Wrapper class for internal access to GraphView's IconBadge.
+    // Allows for creation of badges which don't manually layout their label's dimensions. Works around
+    // a GraphView bug.
+    internal static class IconBadge
+    {
+        public static GraphViewIconBadge CreateError(string message)
+        {
+            var result = GraphViewIconBadge.CreateError(message);
+            result.m_ComputeTextBoundingBox = false;
+            return result;
+        }
+
+        public static GraphViewIconBadge CreateComment(string message)
+        {
+            var result = GraphViewIconBadge.CreateComment(message);
+            result.m_ComputeTextBoundingBox = false;
+            return result;
+        }
+    }
+}
diff --git a/Packages/com.unity.shadergraph/Editor/InternalBridge/IconBadge.cs.meta b/Packages/com.unity.shadergraph/Editor/InternalBridge/IconBadge.cs.meta
diff --git a/Packages/com.unity.shadergraph/Editor/Resources/Styles/Controls/MultiFloatControlView.uss b/Packages/com.unity.shadergraph/Editor/Resources/Styles/Controls/MultiFloatControlView.uss
@@ -14,8 +14,7 @@ MultiFloatControlView > #dummy > Label {
 
 
 .unity-base-field {
-    min-width: 30px;
-    flex-grow: 1;
+    width: 30px;
     margin-top: 1px;
     margin-bottom: 1px;
     margin-left: 0;
diff --git a/Packages/com.unity.shadergraph/Editor/Resources/Styles/MaterialNodeView.uss b/Packages/com.unity.shadergraph/Editor/Resources/Styles/MaterialNodeView.uss
@@ -41,6 +41,11 @@ MaterialNodeView #controls > #items {
     padding-bottom: 4px;
 }
 
+/* Stop dropdown properties from overflowing the node's container */
+MaterialNodeView PropertyRow > #container > #label {
+    min-width: 92px;
+}
+
 MaterialNodeView #title {
     padding-top: 8px;
     border-bottom-width: 8px;
diff --git a/Packages/com.unity.shadergraph/Editor/ShaderGraphPreferences.cs b/Packages/com.unity.shadergraph/Editor/ShaderGraphPreferences.cs
@@ -35,6 +35,22 @@ static class Keys
             internal const string newNodesPreview = "UnityEditor.ShaderGraph.NewNodesPreview";
         }
 
+        // Note that GUIContent in this class is used to generate search keywords for the preferences window
+        class Labels
+        {
+            public static GUIContent previewVariantLimit = new GUIContent("Preview Variant Limit");
+            public static GUIContent autoAddRemoveBlocks = new GUIContent("Automatically Add and Remove Block Nodes");
+            public static GUIContent allowDeprecatedBehaviors = new GUIContent("Enable Deprecated Nodes");
+            public static GUIContent zoomStepSize = new GUIContent("Zoom Step Size", "Default is 0.5");
+            public static GUIContent graphTemplateWorkflow = new GUIContent("Graph Template Workflow",
+                "When creating a new Shadergraph asset from specific menu items, determine if a reference should use a"
+                + " variant of the newly created material sub-asset or the shader itself.");
+            public static GUIContent openNewGraphOnCreation = new GUIContent("Open new Shader Graphs automatically",
+                "Choose whether new ShaderGraph assets should automatically open for editing.");
+            public static GUIContent newNodesPreview = new GUIContent("Expand Node Preview on Node creation",
+                "Choose whether newly added Nodes' Previews should be expanded.");
+        }
+
         static bool m_Loaded = false;
         internal delegate void PreferenceChangedDelegate();
 
@@ -142,7 +158,8 @@ static SettingsProvider PreferenceGUI()
         {
             return new SettingsProvider("Preferences/Shader Graph", SettingsScope.User)
             {
-                guiHandler = searchContext => OpenGUI()
+                guiHandler = searchContext => OpenGUI(),
+                keywords = SettingsProvider.GetSearchKeywordsFromGUIContentProperties<Labels>(),
             };
         }
 
@@ -159,8 +176,8 @@ static void OpenGUI()
                 var willPreviewVariantBeIgnored = ShaderGraphPreferences.previewVariantLimit > actualLimit || ShaderGraphProjectSettings.instance.overrideShaderVariantLimit;
 
                 var variantLimitLabel = willPreviewVariantBeIgnored
-                    ? new GUIContent("Preview Variant Limit", EditorGUIUtility.IconContent("console.infoicon").image, $"The Preview Variant Limit is higher than the Shader Variant Limit in Project Settings: {actualLimit}. The Preview Variant Limit will be ignored.")
-                    : new GUIContent("Preview Variant Limit");
+                    ? new GUIContent(Labels.previewVariantLimit.text, EditorGUIUtility.IconContent("console.infoicon").image, $"The Preview Variant Limit is higher than the Shader Variant Limit in Project Settings: {actualLimit}. The Preview Variant Limit will be ignored.")
+                    : Labels.previewVariantLimit;
 
                 EditorGUI.BeginChangeCheck();
                 var variantLimitValue = EditorGUILayout.DelayedIntField(variantLimitLabel, previewVariantLimit);
@@ -171,42 +188,42 @@ static void OpenGUI()
                 }
 
                 EditorGUI.BeginChangeCheck();
-                var autoAddRemoveBlocksValue = EditorGUILayout.Toggle("Automatically Add and Remove Block Nodes", autoAddRemoveBlocks);
+                var autoAddRemoveBlocksValue = EditorGUILayout.Toggle(Labels.autoAddRemoveBlocks, autoAddRemoveBlocks);
                 if (EditorGUI.EndChangeCheck())
                 {
                     autoAddRemoveBlocks = autoAddRemoveBlocksValue;
                 }
 
                 EditorGUI.BeginChangeCheck();
-                var allowDeprecatedBehaviorsValue = EditorGUILayout.Toggle("Enable Deprecated Nodes", allowDeprecatedBehaviors);
+                var allowDeprecatedBehaviorsValue = EditorGUILayout.Toggle(Labels.allowDeprecatedBehaviors, allowDeprecatedBehaviors);
                 if (EditorGUI.EndChangeCheck())
                 {
                     allowDeprecatedBehaviors = allowDeprecatedBehaviorsValue;
                 }
 
                 EditorGUI.BeginChangeCheck();
-                var zoomStepSizeValue = EditorGUILayout.Slider(new GUIContent("Zoom Step Size", $"Default is 0.5"), zoomStepSize, 0.0f, 1f);
+                var zoomStepSizeValue = EditorGUILayout.Slider(Labels.zoomStepSize.text, zoomStepSize, 0.0f, 1f);
                 if (EditorGUI.EndChangeCheck())
                 {
                     zoomStepSize = zoomStepSizeValue;
                 }
 
                 EditorGUI.BeginChangeCheck();
-                var graphTemplateWorkflowValue = EditorGUILayout.EnumPopup(new GUIContent("Graph Template Workflow", "When creating a new Shadergraph asset from specific menu items, determine if a reference should use a variant of the newly created material sub-asset or the shader itself."), graphTemplateWorkflow);
+                var graphTemplateWorkflowValue = EditorGUILayout.EnumPopup(Labels.graphTemplateWorkflow, graphTemplateWorkflow);
                 if (EditorGUI.EndChangeCheck())
                 {
                     graphTemplateWorkflow = (GraphTemplateWorkflow)graphTemplateWorkflowValue;
                 }
 
                 EditorGUI.BeginChangeCheck();
-                var openNewGraphOnCreationValue = EditorGUILayout.Toggle(new GUIContent("Open new Shader Graphs automatically", "Choose whether new ShaderGraph assets should automatically open for editing."), openNewGraphOnCreation);
+                var openNewGraphOnCreationValue = EditorGUILayout.Toggle(Labels.openNewGraphOnCreation, openNewGraphOnCreation);
                 if (EditorGUI.EndChangeCheck())
                 {
                     openNewGraphOnCreation = openNewGraphOnCreationValue;
                 }
 
                 EditorGUI.BeginChangeCheck();
-                var newNodesPreviewValue = EditorGUILayout.Toggle(new GUIContent("Expand Node Preview on Node creation", "Choose whether newly added Nodes' Previews should be expanded."), newNodesPreview);
+                var newNodesPreviewValue = EditorGUILayout.Toggle(Labels.newNodesPreview, newNodesPreview);
                 if (EditorGUI.EndChangeCheck())
                 {
                     newNodesPreview = newNodesPreviewValue;

Original file line number	Diff line number	Diff line change
`@@ -141,8 +141,7 @@ public bool FindPort(SlotReference slot, out ShaderPort port)`
`141`	`141`	`public void AttachMessage(string errString, ShaderCompilerMessageSeverity severity)`
`142`	`142`	`{`
`143`	`143`	`ClearMessage();`
`144`		`- IconBadge badge;`
`145`		`- badge = IconBadge.CreateComment(errString);`
	`144`	`+ IconBadge badge = InternalBridge.IconBadge.CreateComment(errString);`
`146`	`145`
`147`	`146`	`Add(badge);`
`148`	`147`	`badge.AttachTo(outputContainer, SpriteAlignment.RightCenter);`
Original file line number	Diff line number	Diff line change
`@@ -195,11 +195,11 @@ public void AttachMessage(string errString, ShaderCompilerMessageSeverity severi`
`195`	`195`	`IconBadge badge;`
`196`	`196`	`if (severity == ShaderCompilerMessageSeverity.Error)`
`197`	`197`	`{`
`198`		`- badge = IconBadge.CreateError(errString);`
	`198`	`+ badge = InternalBridge.IconBadge.CreateError(errString);`
`199`	`199`	`}`
`200`	`200`	`else`
`201`	`201`	`{`
`202`		`- badge = IconBadge.CreateComment(errString);`
	`202`	`+ badge = InternalBridge.IconBadge.CreateComment(errString);`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`Add(badge);`
Original file line number	Diff line number	Diff line change
`@@ -326,11 +326,11 @@ public void AttachMessage(string errString, ShaderCompilerMessageSeverity severi`
`326`	`326`	`IconBadge badge;`
`327`	`327`	`if (severity == ShaderCompilerMessageSeverity.Error)`
`328`	`328`	`{`
`329`		`- badge = IconBadge.CreateError(errString);`
	`329`	`+ badge = InternalBridge.IconBadge.CreateError(errString);`
`330`	`330`	`}`
`331`	`331`	`else`
`332`	`332`	`{`
`333`		`- badge = IconBadge.CreateComment(errString);`
	`333`	`+ badge = InternalBridge.IconBadge.CreateComment(errString);`
`334`	`334`	`}`
`335`	`335`
`336`	`336`	`Add(badge);`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,22 @@ static class Keys`
`35`	`35`	`internal const string newNodesPreview = "UnityEditor.ShaderGraph.NewNodesPreview";`
`36`	`36`	`}`
`37`	`37`
	`38`	`+ // Note that GUIContent in this class is used to generate search keywords for the preferences window`
	`39`	`+ class Labels`
	`40`	`+ {`
	`41`	`+ public static GUIContent previewVariantLimit = new GUIContent("Preview Variant Limit");`
	`42`	`+ public static GUIContent autoAddRemoveBlocks = new GUIContent("Automatically Add and Remove Block Nodes");`
	`43`	`+ public static GUIContent allowDeprecatedBehaviors = new GUIContent("Enable Deprecated Nodes");`
	`44`	`+ public static GUIContent zoomStepSize = new GUIContent("Zoom Step Size", "Default is 0.5");`
	`45`	`+ public static GUIContent graphTemplateWorkflow = new GUIContent("Graph Template Workflow",`
	`46`	`+ "When creating a new Shadergraph asset from specific menu items, determine if a reference should use a"`
	`47`	`+ + " variant of the newly created material sub-asset or the shader itself.");`
	`48`	`+ public static GUIContent openNewGraphOnCreation = new GUIContent("Open new Shader Graphs automatically",`
	`49`	`+ "Choose whether new ShaderGraph assets should automatically open for editing.");`
	`50`	`+ public static GUIContent newNodesPreview = new GUIContent("Expand Node Preview on Node creation",`
	`51`	`+ "Choose whether newly added Nodes' Previews should be expanded.");`
	`52`	`+ }`
	`53`	`+`
`38`	`54`	`static bool m_Loaded = false;`
`39`	`55`	`internal delegate void PreferenceChangedDelegate();`
`40`	`56`
`@@ -142,7 +158,8 @@ static SettingsProvider PreferenceGUI()`
`142`	`158`	`{`
`143`	`159`	`return new SettingsProvider("Preferences/Shader Graph", SettingsScope.User)`
`144`	`160`	`{`
`145`		`- guiHandler = searchContext => OpenGUI()`
	`161`	`+ guiHandler = searchContext => OpenGUI(),`
	`162`	`+ keywords = SettingsProvider.GetSearchKeywordsFromGUIContentProperties<Labels>(),`
`146`	`163`	`};`
`147`	`164`	`}`
`148`	`165`
`@@ -159,8 +176,8 @@ static void OpenGUI()`
`159`	`176`	`var willPreviewVariantBeIgnored = ShaderGraphPreferences.previewVariantLimit > actualLimit \|\| ShaderGraphProjectSettings.instance.overrideShaderVariantLimit;`
`160`	`177`
`161`	`178`	`var variantLimitLabel = willPreviewVariantBeIgnored`
`162`		`- ? new GUIContent("Preview Variant Limit", EditorGUIUtility.IconContent("console.infoicon").image, $"The Preview Variant Limit is higher than the Shader Variant Limit in Project Settings: {actualLimit}. The Preview Variant Limit will be ignored.")`
`163`		`- : new GUIContent("Preview Variant Limit");`
	`179`	`+ ? new GUIContent(Labels.previewVariantLimit.text, EditorGUIUtility.IconContent("console.infoicon").image, $"The Preview Variant Limit is higher than the Shader Variant Limit in Project Settings: {actualLimit}. The Preview Variant Limit will be ignored.")`
	`180`	`+ : Labels.previewVariantLimit;`
`164`	`181`
`165`	`182`	`EditorGUI.BeginChangeCheck();`
`166`	`183`	`var variantLimitValue = EditorGUILayout.DelayedIntField(variantLimitLabel, previewVariantLimit);`
`@@ -171,42 +188,42 @@ static void OpenGUI()`
`171`	`188`	`}`
`172`	`189`
`173`	`190`	`EditorGUI.BeginChangeCheck();`
`174`		`- var autoAddRemoveBlocksValue = EditorGUILayout.Toggle("Automatically Add and Remove Block Nodes", autoAddRemoveBlocks);`
	`191`	`+ var autoAddRemoveBlocksValue = EditorGUILayout.Toggle(Labels.autoAddRemoveBlocks, autoAddRemoveBlocks);`
`175`	`192`	`if (EditorGUI.EndChangeCheck())`
`176`	`193`	`{`
`177`	`194`	`autoAddRemoveBlocks = autoAddRemoveBlocksValue;`
`178`	`195`	`}`
`179`	`196`
`180`	`197`	`EditorGUI.BeginChangeCheck();`
`181`		`- var allowDeprecatedBehaviorsValue = EditorGUILayout.Toggle("Enable Deprecated Nodes", allowDeprecatedBehaviors);`
	`198`	`+ var allowDeprecatedBehaviorsValue = EditorGUILayout.Toggle(Labels.allowDeprecatedBehaviors, allowDeprecatedBehaviors);`
`182`	`199`	`if (EditorGUI.EndChangeCheck())`
`183`	`200`	`{`
`184`	`201`	`allowDeprecatedBehaviors = allowDeprecatedBehaviorsValue;`
`185`	`202`	`}`
`186`	`203`
`187`	`204`	`EditorGUI.BeginChangeCheck();`
`188`		`- var zoomStepSizeValue = EditorGUILayout.Slider(new GUIContent("Zoom Step Size", $"Default is 0.5"), zoomStepSize, 0.0f, 1f);`
	`205`	`+ var zoomStepSizeValue = EditorGUILayout.Slider(Labels.zoomStepSize.text, zoomStepSize, 0.0f, 1f);`
`189`	`206`	`if (EditorGUI.EndChangeCheck())`
`190`	`207`	`{`
`191`	`208`	`zoomStepSize = zoomStepSizeValue;`
`192`	`209`	`}`
`193`	`210`
`194`	`211`	`EditorGUI.BeginChangeCheck();`
`195`		`- var graphTemplateWorkflowValue = EditorGUILayout.EnumPopup(new GUIContent("Graph Template Workflow", "When creating a new Shadergraph asset from specific menu items, determine if a reference should use a variant of the newly created material sub-asset or the shader itself."), graphTemplateWorkflow);`
	`212`	`+ var graphTemplateWorkflowValue = EditorGUILayout.EnumPopup(Labels.graphTemplateWorkflow, graphTemplateWorkflow);`
`196`	`213`	`if (EditorGUI.EndChangeCheck())`
`197`	`214`	`{`
`198`	`215`	`graphTemplateWorkflow = (GraphTemplateWorkflow)graphTemplateWorkflowValue;`
`199`	`216`	`}`
`200`	`217`
`201`	`218`	`EditorGUI.BeginChangeCheck();`
`202`		`- var openNewGraphOnCreationValue = EditorGUILayout.Toggle(new GUIContent("Open new Shader Graphs automatically", "Choose whether new ShaderGraph assets should automatically open for editing."), openNewGraphOnCreation);`
	`219`	`+ var openNewGraphOnCreationValue = EditorGUILayout.Toggle(Labels.openNewGraphOnCreation, openNewGraphOnCreation);`
`203`	`220`	`if (EditorGUI.EndChangeCheck())`
`204`	`221`	`{`
`205`	`222`	`openNewGraphOnCreation = openNewGraphOnCreationValue;`
`206`	`223`	`}`
`207`	`224`
`208`	`225`	`EditorGUI.BeginChangeCheck();`
`209`		`- var newNodesPreviewValue = EditorGUILayout.Toggle(new GUIContent("Expand Node Preview on Node creation", "Choose whether newly added Nodes' Previews should be expanded."), newNodesPreview);`
	`226`	`+ var newNodesPreviewValue = EditorGUILayout.Toggle(Labels.newNodesPreview, newNodesPreview);`
`210`	`227`	`if (EditorGUI.EndChangeCheck())`
`211`	`228`	`{`
`212`	`229`	`newNodesPreview = newNodesPreviewValue;`