CMCL-1517: Fix ListView inspectors

com.unity.cinemachine/CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this package will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [3.0.0-pre.9] - 2023-10-31
+
+### Fixed
+- Regresion fix: Sequencer inspector child camera popups were not being populated.
+- Regresion fix: Manager Camera's child camera warning icons were not being updated correctly.
+- Bugfix: CinemachineInputAxisController editor was missing foldout arrows on the Driven Axis items.
+
+
 ## [3.0.0-pre.8] - 2023-09-22
 
 ### Fixed

com.unity.cinemachine/Editor/Editors/CinemachineBlenderSettingsEditor.cs

@@ -68,27 +68,23 @@ public override VisualElement CreateInspectorGUI()
                 list.RefreshItems();  // rebuild the list
             });
 
-            // Delay to work around a bug in ListView (UUM-27687 and UUM-27688)
-            list.OnInitialGeometry(() =>
+            list.makeItem = () => new BindableElement { style = { flexDirection = FlexDirection.Row }};
+            list.bindItem = (row, index) =>
             {
-                list.makeItem = () => new BindableElement { style = { flexDirection = FlexDirection.Row }};
-                list.bindItem = (row, index) =>
-                {
-                    // Remove children - items get recycled
-                    for (int i = row.childCount - 1; i >= 0; --i)
-                        row.RemoveAt(i);
+                // Remove children - items get recycled
+                for (int i = row.childCount - 1; i >= 0; --i)
+                    row.RemoveAt(i);
 
-                    var def = new CinemachineBlenderSettings.CustomBlend();
-                    var element = elements.GetArrayElementAtIndex(index);
+                var def = new CinemachineBlenderSettings.CustomBlend();
+                var element = elements.GetArrayElementAtIndex(index);
 
-                    var from = row.AddChild(CreateCameraPopup(element.FindPropertyRelative(() => def.From)));
-                    var to = row.AddChild(CreateCameraPopup(element.FindPropertyRelative(() => def.To)));
-                    var blend = row.AddChild(new PropertyField(element.FindPropertyRelative(() => def.Blend), ""));
-                    FormatElement(false, from, to, blend);
+                var from = row.AddChild(CreateCameraPopup(element.FindPropertyRelative(() => def.From)));
+                var to = row.AddChild(CreateCameraPopup(element.FindPropertyRelative(() => def.To)));
+                var blend = row.AddChild(new PropertyField(element.FindPropertyRelative(() => def.Blend), ""));
+                FormatElement(false, from, to, blend);
 
-                    ((BindableElement)row).BindProperty(element); // bind must be done at the end
-                };
-            });
+                ((BindableElement)row).BindProperty(element); // bind must be done at the end
+            };
 
             // Local function
             static void FormatElement(bool isHeader, VisualElement e1, VisualElement e2, VisualElement e3)

com.unity.cinemachine/Editor/Editors/CinemachineSequencerCameraEditor.cs

@@ -63,19 +63,9 @@ public override VisualElement CreateInspectorGUI()
                 var element = instructions.GetArrayElementAtIndex(index);
 
                 var vcamSelProp = element.FindPropertyRelative(() => def.Camera);
-                var vcamSel = row.AddChild(new PopupField<Object>());
+                var vcamSel = row.AddChild(new PopupField<Object> { name = $"vcamSelector{index}" });
                 vcamSel.formatListItemCallback = (obj) => obj == null ? "(null)" : obj.name;
                 vcamSel.formatSelectedValueCallback = (obj) => obj == null ? "(null)" : obj.name;
-                vcamSel.TrackAnyUserActivity(() => 
-                {
-                    if (Target == null)
-                        return; // object deleted
-                    vcamSel.choices ??= new();
-                    vcamSel.choices.Clear();
-                    var children = Target.ChildCameras;
-                    for (int i = 0; i < children.Count; ++i)
-                        vcamSel.choices.Add(children[i]);
-                });
 
                 var blend = row.AddChild(
                     new PropertyField(element.FindPropertyRelative(() => def.Blend), ""));
@@ -90,6 +80,28 @@ public override VisualElement CreateInspectorGUI()
                 vcamSel.BindProperty(vcamSelProp);
             };
 
+            // Update the list items
+            list.TrackAnyUserActivity(() =>
+            {
+                int index = 0;
+                var iter = list.itemsSource.GetEnumerator();
+                while (iter.MoveNext())
+                {
+                    var vcamSel = list.Q<PopupField<Object>>($"vcamSelector{index}");
+                    if (vcamSel != null)
+                    {
+                        if (Target == null)
+                            return; // object deleted
+                        vcamSel.choices ??= new();
+                        vcamSel.choices.Clear();
+                        var children = Target.ChildCameras;
+                        for (int i = 0; i < children.Count; ++i)
+                            vcamSel.choices.Add(children[i]);
+                    }
+                    ++index;
+                }
+            });
+
             // Local function
             static void FormatInstructionElement(bool isHeader, VisualElement e1, VisualElement e2, VisualElement e3)
             {

com.unity.cinemachine/Editor/Editors/InputAxisControllerEditor.cs

@@ -136,7 +136,7 @@ public override VisualElement CreatePropertyGUI(SerializedProperty property)
                 foldout.Add(new PropertyField(childProperty));
                 childProperty.NextVisible(false);
             }
-            return new InspectorUtility.FoldoutWithOverlay(foldout, overlay, null);
+            return new InspectorUtility.FoldoutWithOverlay(foldout, overlay, null) { style = { marginLeft = 12 }};
         }
     }
 
@@ -158,13 +158,11 @@ public override VisualElement CreatePropertyGUI(SerializedProperty property)
                 showBorder = false,
                 showBoundCollectionSize = false,
                 showFoldoutHeader = false,
-                virtualizationMethod = CollectionVirtualizationMethod.DynamicHeight
+                virtualizationMethod = CollectionVirtualizationMethod.DynamicHeight,
+                style = { marginLeft = -12 }
             });
             list.BindProperty(property);
 
-            // Delay to work around a bug in ListView (UUM-33402)
-            list.OnInitialGeometry(() => list.reorderable = false);
-
             var isEmptyMessage = ux.AddChild(new HelpBox(
                 "No applicable components found.  Must have one of: "
                     + InspectorUtility.GetAssignableBehaviourNames(typeof(IInputAxisOwner)), 

com.unity.cinemachine/Editor/Utility/CmCameraInspectorUtility.cs

@@ -507,7 +507,6 @@ public static void AddChildCameras(
                 for (int i = row.childCount - 1; i >= 0; --i)
                     row.RemoveAt(i);
 
-                var warningIcon = row.AddChild(InspectorUtility.MiniHelpIcon("Item is null"));
                 var element = list.itemsSource[index] as CinemachineVirtualCameraBase;
                 row.AddChild(new ObjectField 
                 { 
@@ -518,6 +517,11 @@ public static void AddChildCameras(
                 if (element == null)
                     return;
 
+                var warningIcon = row.AddChild(InspectorUtility.MiniHelpIcon("Item is null"));
+                var warningText = getChildWarning == null ? string.Empty : getChildWarning(element);
+                warningIcon.tooltip = warningText;
+                warningIcon.SetVisible(!string.IsNullOrEmpty(warningText));
+
                 var dragger = row.AddChild(new Label(" "));
                 dragger.AddToClassList("unity-base-field__label--with-dragger");
 
@@ -540,13 +544,6 @@ public static void AddChildCameras(
                 });
                 priorityField.TrackPropertyValue(priorityProp, (p) => priorityField.value = p.intValue);
                 priorityField.TrackPropertyValue(enabledProp, (p) => priorityField.value = p.boolValue ? priorityProp.intValue : 0);
-
-                warningIcon.TrackAnyUserActivity(() =>
-                {
-                    var warningText = (getChildWarning == null || element == null) ? string.Empty : getChildWarning(element);
-                    warningIcon.tooltip = warningText;
-                    warningIcon.SetVisible(!string.IsNullOrEmpty(warningText));
-                });
             };
 
             list.itemsAdded += (added) =>
@@ -585,10 +582,8 @@ public static void AddChildCameras(
                 // Update child list
                 if (!isMultiSelect)
                 {
-                    var rebuild = list.itemsSource != vcam.ChildCameras || list.itemsSource.Count != vcam.ChildCameras.Count;
                     list.itemsSource = vcam.ChildCameras;
-                    if (rebuild)
-                        list.Rebuild();
+                    list.Rebuild();
                 }
             });
         }