[ShaderGraph] Batch of various fixes

Address and batch various minor bugfixes.

Author: Esmeralda Salamone

Packages/com.unity.shadergraph/Editor/Data/Graphs/DynamicVectorMaterialSlot.cs

@@ -84,7 +84,7 @@ protected override string ConcreteSlotValueAsVariable()
             var channelCount = SlotValueHelper.GetChannelCount(concreteValueType);
             string values = NodeUtils.FloatToShaderValue(value.x);
             if (channelCount == 1)
-                return values;
+                return string.Format("$precision({0})", values);
             for (var i = 1; i < channelCount; i++)
                 values += ", " + NodeUtils.FloatToShaderValue(value[i]);
             return string.Format("$precision{0}({1})", channelCount, values);

Packages/com.unity.shadergraph/Editor/Data/Graphs/Vector1MaterialSlot.cs

@@ -69,7 +69,7 @@ public override VisualElement InstantiateControl()
 
         protected override string ConcreteSlotValueAsVariable()
         {
-            return NodeUtils.FloatToShaderValue(value);
+            return string.Format("$precision({0})", NodeUtils.FloatToShaderValue(value));
         }
 
         public override void AddDefaultProperty(PropertyCollector properties, GenerationMode generationMode)

Packages/com.unity.shadergraph/Editor/Drawing/Views/GraphEditorView.cs

@@ -424,10 +424,10 @@ void NodeCreationRequest(NodeCreationContext c)
             {
                 m_SearchWindowProvider.connectedPort = null;
                 m_SearchWindowProvider.target = c.target ?? m_HoveredContextView;
-                var displayPosition = (c.screenMousePosition - m_EditorWindow.position.position);
+                var displayPosition = graphView.cachedMousePosition;
 
                 SearcherWindow.Show(m_EditorWindow, (m_SearchWindowProvider as SearcherProvider).LoadSearchWindow(),
-                    item => (m_SearchWindowProvider as SearcherProvider).OnSearcherSelectEntry(item, c.screenMousePosition - m_EditorWindow.position.position),
+                    item => (m_SearchWindowProvider as SearcherProvider).OnSearcherSelectEntry(item, displayPosition),
                     displayPosition, null, new SearcherWindow.Alignment(SearcherWindow.Alignment.Vertical.Center, SearcherWindow.Alignment.Horizontal.Left));
             }
         }

Packages/com.unity.shadergraph/Editor/Generation/Targets/Canvas/CanvasStructs.cs

@@ -17,6 +17,8 @@ internal static class CanvasStructs
                 StructFields.Varyings.screenPosition,
                 StructFields.Varyings.texCoord0,
                 StructFields.Varyings.texCoord1,
+                StructFields.Varyings.texCoord2,
+                StructFields.Varyings.texCoord3,
                 StructFields.Varyings.color,
                 StructFields.Varyings.instanceID,
                 StructFields.Varyings.vertexID,
@@ -38,6 +40,8 @@ internal static class CanvasStructs
                 StructFields.Attributes.color,
                 StructFields.Attributes.uv0,
                 StructFields.Attributes.uv1,
+                StructFields.Attributes.uv2,
+                StructFields.Attributes.uv3,
                 StructFields.Attributes.instanceID,
                 StructFields.Attributes.vertexID,
             }

Packages/com.unity.shadergraph/Editor/Generation/Targets/Canvas/CanvasSubTarget.cs

@@ -405,8 +405,6 @@ static class CanvasRequiredFields
             StructFields.Attributes.color,
             StructFields.Attributes.uv0, // Always need texCoord0, for UI image
             StructFields.Attributes.uv1, // Always need texCoord1 for UI Clip Mask
-            StructFields.Attributes.uv2,
-            StructFields.Attributes.uv3,
             StructFields.Attributes.positionOS,
             StructFields.Attributes.normalOS,
             StructFields.Attributes.instanceID,

Packages/com.unity.shadergraph/Editor/Resources/Styles/PropertyRow.uss

@@ -21,7 +21,7 @@ PropertyRow > #container{
 PropertyRow > #container > #label {
     flex-grow: 2;
     flex-basis: 0;
-    min-width: 92px;
+    min-width: 184px;
     width: 92px;
     font-size: 12px;
     margin-right: 4px;
@@ -47,6 +47,7 @@ PropertyRow > #container > #content{
     flex-basis: 0;
     height: auto;
     -unity-font-style: bold;
+    min-width: 64px;
     width: 100px;
     justify-content: center;
 }

Packages/com.unity.shadergraph/Tests/Editor/UnitTests/MaterialSlotTests.cs

@@ -103,8 +103,8 @@ public void MaterialSlotReturnsValidDefaultValue()
             Assert.AreEqual(expected, result);
 
             m_NodeA.slot1.value = 6;
-            result = m_NodeA.slot1.GetDefaultValue(GenerationMode.ForReals);
-            Assert.AreEqual("6", result);
+            result = m_NodeA.slot1.GetDefaultValue(GenerationMode.ForReals, ConcretePrecision.Half);
+            Assert.AreEqual("half(6)", result);
 
             m_NodeA.slot2.value = new Vector4(6, 6, 6, 1);
             result = m_NodeA.slot2.GetDefaultValue(GenerationMode.ForReals, ConcretePrecision.Half);