Commit 435badc

committed

Add ItemTemplate selection directly in the UI Builder for Unity 2023.

1 parent c9b5575 commit 435badcCopy full SHA for 435badc

File tree

+38

-10

lines changed

+38

-10

lines changed

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public virtual void SetBindingContext(IBindingContext context, IObjectProvider o`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`_itemsSourceBindingData ??= BindingItemsSourcePath.ToPropertyBindingData();`
`57`		`- _itemTemplate ??= objectProvider.GetCollectionItemTemplate<TItemBindingContext,VisualTreeAsset>();`
	`57`	`+ _itemTemplate ??= GetItemTemplate(objectProvider);`
`58`	`58`
`59`	`59`	`_objectProvider = objectProvider;`
`60`	`60`
`@@ -151,5 +151,16 @@ private void OnUnbindItem(VisualElement item, int index)`
`151`	`151`	`UnbindItem(item, index, itemBindingContext, _objectProvider);`
`152`	`152`	`}`
`153`	`153`	`}`
	`154`	`+`
	`155`	`+ private VisualTreeAsset GetItemTemplate(IObjectProvider objectProvider)`
	`156`	`+ {`
	`157`	`+#if UNITY_2023_2_OR_NEWER`
	`158`	`+ return ItemTemplate`
	`159`	`+ ? ItemTemplate`
	`160`	`+ : objectProvider.GetCollectionItemTemplate<TItemBindingContext, VisualTreeAsset>();`
	`161`	`+#else`
	`162`	`+ return objectProvider.GetCollectionItemTemplate<TItemBindingContext, VisualTreeAsset>();`
	`163`	`+#endif`
	`164`	`+ }`
`154`	`165`	`}`
`155`	`166`	`}`

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public virtual void SetBindingContext(IBindingContext context, IObjectProvider o`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`_itemsSourceBindingData ??= BindingItemsSourcePath.ToPropertyBindingData();`
`65`		`- _itemTemplate ??= objectProvider.GetCollectionItemTemplate<TItemBindingContext,VisualTreeAsset>();`
	`65`	`+ _itemTemplate ??= GetItemTemplate(objectProvider);`
`66`	`66`
`67`	`67`	`_objectProvider = objectProvider;`
`68`	`68`
`@@ -224,5 +224,16 @@ private void OnPoolDestroyItem(VisualElement item)`
`224`	`224`	`{`
`225`	`225`	`item.DisposeBindableElement(_objectProvider);`
`226`	`226`	`}`
	`227`	`+`
	`228`	`+ private VisualTreeAsset GetItemTemplate(IObjectProvider objectProvider)`
	`229`	`+ {`
	`230`	`+#if UNITY_2023_2_OR_NEWER`
	`231`	`+ return ItemTemplate`
	`232`	`+ ? ItemTemplate`
	`233`	`+ : objectProvider.GetCollectionItemTemplate<TItemBindingContext, VisualTreeAsset>();`
	`234`	`+#else`
	`235`	`+ return objectProvider.GetCollectionItemTemplate<TItemBindingContext, VisualTreeAsset>();`
	`236`	`+#endif`
	`237`	`+ }`
`227`	`238`	`}`
`228`	`239`	`}`

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,23 +6,26 @@ namespace UnityMvvmToolkit.UITK.BindableUIElements`
`6`	`6`	`partial class BindableListView<TItemBindingContext, TCollection>`
`7`	`7`	`{`
`8`	`8`	`public string BindingItemsSourcePath { get; private set; }`
	`9`	`+ public VisualTreeAsset ItemTemplate { get; private set; }`
`9`	`10`
`10`	`11`	`#if UNITY_2023_2_OR_NEWER`
`11`	`12`	`[System.Serializable]`
`12`	`13`	`public new class UxmlSerializedData : ListView.UxmlSerializedData`
`13`	`14`	`{`
`14`		`- // ReSharper disable once InconsistentNaming`
`15`	`15`	`#pragma warning disable 649`
	`16`	`+ // ReSharper disable once InconsistentNaming`
`16`	`17`	`[UnityEngine.SerializeField] private string BindingItemsSourcePath;`
	`18`	`+ // ReSharper disable once InconsistentNaming`
	`19`	`+ [UnityEngine.SerializeField] private VisualTreeAsset ItemTemplate;`
`17`	`20`	`#pragma warning restore 649`
`18`	`21`
`19`	`22`	`public override void Deserialize(object visualElement)`
`20`	`23`	`{`
`21`	`24`	`base.Deserialize(visualElement);`
`22`	`25`
`23`		`- visualElement`
`24`		`- .As<BindableListView<TItemBindingContext,TCollection>>()`
`25`		`- .BindingItemsSourcePath = BindingItemsSourcePath;`
	`26`	`+ varbindableListView=visualElement.As<BindableListView<TItemBindingContext,TCollection>>();`
	`27`	`+ bindableListView.BindingItemsSourcePath=BindingItemsSourcePath;`
	`28`	`+ bindableListView.ItemTemplate = ItemTemplate;`
`26`	`29`	`}`
`27`	`30`	`}`
`28`	`31`	`#else`

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,23 +6,26 @@ namespace UnityMvvmToolkit.UITK.BindableUIElements`
`6`	`6`	`partial class BindableScrollView<TItemBindingContext>`
`7`	`7`	`{`
`8`	`8`	`public string BindingItemsSourcePath { get; private set; }`
	`9`	`+ public VisualTreeAsset ItemTemplate { get; private set; }`
`9`	`10`
`10`	`11`	`#if UNITY_2023_2_OR_NEWER`
`11`	`12`	`[System.Serializable]`
`12`	`13`	`public new class UxmlSerializedData : ScrollView.UxmlSerializedData`
`13`	`14`	`{`
`14`		`- // ReSharper disable once InconsistentNaming`
`15`	`15`	`#pragma warning disable 649`
	`16`	`+ // ReSharper disable once InconsistentNaming`
`16`	`17`	`[UnityEngine.SerializeField] private string BindingItemsSourcePath;`
	`18`	`+ // ReSharper disable once InconsistentNaming`
	`19`	`+ [UnityEngine.SerializeField] private VisualTreeAsset ItemTemplate;`
`17`	`20`	`#pragma warning restore 649`
`18`	`21`
`19`	`22`	`public override void Deserialize(object visualElement)`
`20`	`23`	`{`
`21`	`24`	`base.Deserialize(visualElement);`
`22`	`25`
`23`		`- visualElement`
`24`		`- .As<BindableScrollView<TItemBindingContext>>()`
`25`		`- .BindingItemsSourcePath = BindingItemsSourcePath;`
	`26`	`+ varbindableListView=visualElement.As<BindableScrollView<TItemBindingContext>>();`
	`27`	`+ bindableListView.BindingItemsSourcePath=BindingItemsSourcePath;`
	`28`	`+ bindableListView.ItemTemplate = ItemTemplate;`
`26`	`29`	`}`
`27`	`30`	`}`
`28`	`31`	`#else`

Comments

(0)