[Port][6000.3][UUM-133930] Fix Shader Graph icon badges overflowing their container

Author: april-roszkowski

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 = IconBadgeWrapper.CreateComment(errString);
 
             Add(badge);
             badge.AttachTo(outputContainer, SpriteAlignment.RightCenter);

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 = IconBadgeWrapper.CreateError(errString);
             }
             else
             {
-                badge = IconBadge.CreateComment(errString);
+                badge = IconBadgeWrapper.CreateComment(errString);
             }
 
             Add(badge);

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 = IconBadgeWrapper.CreateError(errString);
             }
             else
             {
-                badge = IconBadge.CreateComment(errString);
+                badge = IconBadgeWrapper.CreateComment(errString);
             }
 
             Add(badge);

Packages/com.unity.shadergraph/Editor/Util/IconBadgeWrapper.cs

@@ -0,0 +1,24 @@
+using GraphViewIconBadge = UnityEditor.Experimental.GraphView.IconBadge;
+
+namespace UnityEditor.ShaderGraph
+{
+    // 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 IconBadgeWrapper
+    {
+        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;
+        }
+    }
+}