Change some non-critical errors to warnings. Improvements to ListBind…

…able
LudiKha · Jan 29, 2024 · 0261f96 · 0261f96
1 parent ae050e0
commit 0261f96
Show file tree

Hide file tree

Showing 6 changed files with 221 additions and 190 deletions.
diff --git a/src/Core/Scripts/Binding/Binder.cs b/src/Core/Scripts/Binding/Binder.cs
@@ -534,9 +534,19 @@ internal static void BindListView(ListView el, in object context, Plate plate, V
 
     internal static void InternalBindListView(ListView el, in object context, IList itemsSource, VisualTreeAsset templateAsset, Plate plate)
     {
-      Func<VisualElement> makeItem = () =>
+      bool elementsPickable = true;
+
+	  if (context is IListViewBindable bindable)
+	  {
+		bindable.Apply(el);
+		BindCallbacks(el, context);
+        elementsPickable = bindable.ElementsPickable;
+	  }
+
+	  Func<VisualElement> makeItem = () =>
       {
         var e = InternalInstantiate(templateAsset, plate);
+        e.pickingMode = elementsPickable ? PickingMode.Position : PickingMode.Ignore;
         return e;
       };
       Action<VisualElement, int> bindItem = (e, i) =>
@@ -552,11 +562,6 @@ internal static void InternalBindListView(ListView el, in object context, IList
       el.bindItem = bindItem;
       el.itemsSource = itemsSource;
 
-      if (context is IListViewBindable bindable)
-      {
-        bindable.Apply(el);
-        BindCallbacks(el, context);
-      }
     }
 
     private static void BindCycleField(CycleField el, ref object context, List<ValueWithAttribute<BindAttribute>> members, Plate plate)

diff --git a/src/Core/Scripts/Hierarchy/Plate.cs b/src/Core/Scripts/Hierarchy/Plate.cs
@@ -55,7 +55,7 @@ public class Plate : GrapheneComponent, IGrapheneInitializable, IDisposable
 	#endregion
 
 	#region Inspector/Authoring
-	[SerializeField, OnValueChanged(nameof(OnChangeDocument))] VisualTreeAsset visualAsset; public VisualTreeAsset VisualTreeAsset => visualAsset;
+	[SerializeField, OnValueChanged(nameof(OnChangeDocument))] VisualTreeAsset visualAsset; public VisualTreeAsset VisualTreeAsset { get =>  visualAsset;  set => SetVisualTreeAsset(value); }
     [SerializeField, HideInInspector] VisualTreeAsset cachedAsset;
 
 
@@ -337,8 +337,10 @@ void InitViewsRuntime()
 
       if (!defaultViewRef.initialized)
       {
+#if UNITY_ASSERTIONS
         if(children.Count > 0 || renderer != null)
-          Debug.LogError($"No default view {defaultViewRef.Id}", this);
+          Debug.LogWarning($"No default view {defaultViewRef.Id}", this);
+#endif
       }
 
 	  contentViewRef.ResolveView(this);
@@ -366,6 +368,14 @@ void EditModeCacheViewIds()
 	  }
     }
 
+    void SetVisualTreeAsset(VisualTreeAsset asset)
+    {
+      if(this.visualAsset == asset) 
+        return;
+      this.visualAsset = asset;
+      OnChangeDocument();
+	}
+
     void OnChangeDocument()
     {
 	  UpdateViewPlates();