Fixed some ui bugs

Author: Cibbi

Editor/Editors/Components/FunctionTimeline.cs

@@ -330,7 +330,7 @@ public FunctionViewer()
         {
             var title = new Label("Selected function information");
             title.AddToClassList("area-title");
-            var content = new ScrollView(ScrollViewMode.VerticalAndHorizontal);
+            var content = new ScrollView(ScrollViewMode.Vertical);
             content.AddToClassList("area-content");
 
             _name = new LabelField("Name", "");
@@ -401,6 +401,8 @@ public LabelField(string label, string value)
             _labelField.AddToClassList("unity-base-field__label");
             _labelField.AddToClassList("unity-base-text-field__label");
             _labelField.AddToClassList("unity-text-field__label");
+            _labelField.AddToClassList("label-field-title");
+            _valueField.AddToClassList("label-field-value");
 
             Add(_labelField);
             Add(_valueField);
@@ -475,7 +477,7 @@ public ModuleViewer()
         {
             var title = new Label("Function's module base info");
             title.AddToClassList("area-title");
-            var content = new ScrollView(ScrollViewMode.VerticalAndHorizontal);
+            var content = new ScrollView(ScrollViewMode.Vertical);
             _content = content;
             _content.AddToClassList("area-content");
 

Editor/Editors/Drawers/EnablePropertyDrawer.cs

@@ -22,6 +22,7 @@ public override VisualElement CreatePropertyGUI(SerializedProperty property)
             foldout.text = property.displayName;
             foldout.RegisterValueChangedCallback((e) => property.isExpanded = e.newValue);
             foldout.value = property.isExpanded;
+
             foldout.Add(template);
             _root.Add(foldout);
 

Editor/Editors/Drawers/FunctionPropertyDrawer.cs

@@ -21,6 +21,10 @@ public override VisualElement CreatePropertyGUI(SerializedProperty property)
             foldout.text = property.displayName;
             foldout.RegisterValueChangedCallback((e) => property.isExpanded = e.newValue);
             foldout.value = property.isExpanded;
+            
+            var nameField = template.Q<TextField>("Name");
+            nameField.RegisterValueChangedCallback(evt => foldout.text = evt.newValue);
+            
             foldout.Add(template);
             _root.Add(foldout);
 

Editor/Editors/Drawers/ShaderPropertyDrawer.cs

@@ -48,15 +48,14 @@ public override VisualElement CreatePropertyGUI(SerializedProperty property)
             foldout.RegisterValueChangedCallback((e) => property.isExpanded = e.newValue);
             foldout.value = property.isExpanded;
 
+            var nameField = template.Q<TextField>("Name");
+            nameField.RegisterValueChangedCallback(evt => foldout.text = evt.newValue);
             var enumField = template.Q<EnumField>("TypeField");
             var valueContainer = template.Q<VisualElement>("ValueContainer");
 
             var type = property.FindPropertyRelative("Type");
             var defaultValue = property.FindPropertyRelative("DefaultValue");
-            
-   
 
-            
             var propType = GetPropertyTypeFromSerializedProperty(type.stringValue);
 
             enumField.value = propType;
@@ -222,7 +221,7 @@ private void UpdateValueContainer(SerializedProperty defaultValue, SerializedPro
                     }
 
                     if (vfi) colorValue = new Color(fv[0], fv[1], fv[2], fv[3]);
-                    else SetPropDefaultValue(defaultValue,$"({fv[0]}, {fv[1]}, {fv[2]}, {fv[3]})");
+                    else SetPropDefaultValue(defaultValue,$"({colorValue[0]}, {colorValue[1]}, {colorValue[2]}, {colorValue[3]})");
                     var clfield = new ColorField { value = colorValue, label = "Default value" };
                     field = clfield;
                     clfield.RegisterValueChangedCallback(e => SetPropDefaultValue(defaultValue,$"({e.newValue[0]}, {e.newValue[1]}, {e.newValue[2]}, {e.newValue[3]})"));
@@ -276,8 +275,6 @@ private void UpdateValueContainer(SerializedProperty defaultValue, SerializedPro
 
         private static PropertyType GetPropertyTypeFromSerializedProperty(string propType)
         {
-            
-            
             switch (propType.Trim())
             {
                 case "Float": return PropertyType.Float;

Editor/Editors/Drawers/VariablePropertyDrawer.cs

@@ -26,6 +26,8 @@ public override VisualElement CreatePropertyGUI(SerializedProperty property)
             foldout.Add(template);
             _root.Add(foldout);
 
+            var nameField = template.Q<TextField>("Name");
+            nameField.RegisterValueChangedCallback(evt => foldout.text = evt.newValue);
             var typeField = template.Q<EnumField>("Type");
             var customTypeField = template.Q<VisualElement>("CustomType");
 

Editor/Resources/MSS/MSSUIElements/EnablePropertyDrawer.uxml

@@ -2,4 +2,5 @@
     <ui:TextField picking-mode="Ignore" label="Name" binding-path="Name" />
     <ui:TextField picking-mode="Ignore" label="Display Name" binding-path="DisplayName" />
     <uie:IntegerField label="Enable Value" value="0" binding-path="EnableValue" />
+    <VRLabs.ModularShaderSystem.InspectorList show-elements-text="false" binding-path="Attributes" />
 </ui:UXML>

Editor/Resources/MSS/MSSUIElements/FunctionPropertyDrawer.uxml

@@ -1,5 +1,5 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements">
-    <ui:TextField picking-mode="Ignore" label="Name" binding-path="Name" />
+    <ui:TextField name="Name" picking-mode="Ignore" label="Name" binding-path="Name" />
     <ui:TextField picking-mode="Ignore" label="Append After" binding-path="AppendAfter" />
     <uie:IntegerField label="Queue" value="100" binding-path="Queue" />
     <uie:PropertyField binding-path="ShaderFunctionCode" label="Function Code" focusable="true" />

Editor/Resources/MSS/MSSUIElements/FunctionTimelineStyle.uss

@@ -145,4 +145,10 @@ Foldout > Toggle
 .selected-variable
 {
     background-color: rgba(255,255,0,0.2);
+}
+
+.label-field-value
+{
+    white-space: normal;
+    flex-shrink: 1;
 }

Editor/Resources/MSS/MSSUIElements/ShaderPropertyDrawer.uxml

@@ -1,5 +1,5 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements">
-    <ui:TextField label="Name" binding-path="Name" />
+    <ui:TextField name="Name" label="Name" binding-path="Name" />
     <ui:TextField label="Display Name" binding-path="DisplayName" />
     <uie:EnumField name="TypeField" label="Type" type="VRLabs.ModularShaderSystem.PropertyType, Assembly-CSharp-Editor" />
     <ui:VisualElement name="ValueContainer" />

Editor/Resources/MSS/MSSUIElements/VariablePropertyDrawer.uxml

@@ -1,5 +1,5 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements">
-    <ui:TextField picking-mode="Ignore" label="Name" binding-path="Name" />
+    <ui:TextField name="Name" picking-mode="Ignore" label="Name" binding-path="Name" />
     <uie:EnumField name="Type" label="Type" type="VRLabs.ModularShaderSystem.VariableType, Assembly-CSharp-Editor" binding-path="Type" />
     <ui:TextField name="CustomType" picking-mode="Ignore" label="Custom Type" binding-path="CustomType" />
 </ui:UXML>