From c3eb662df8c91f84209a6c77cc81eec69673545d Mon Sep 17 00:00:00 2001
From: lilisha-unity <lisha.li@unity3d.com>
Date: Tue, 11 Oct 2022 15:56:36 +0000
Subject: [PATCH 01/53] Added create a popup window code example

---
 .../Editor/PopupContentExample.cs             | 30 +++++++++++++++++++
 create-a-popup-window/Editor/PopupExample.cs  | 23 ++++++++++++++
 create-a-popup-window/Editor/PopupExample.uss |  3 ++
 .../Editor/PopupExample.uxml                  |  4 +++
 .../Editor/PopupWindowContent.uxml            |  6 ++++
 5 files changed, 66 insertions(+)
 create mode 100644 create-a-popup-window/Editor/PopupContentExample.cs
 create mode 100644 create-a-popup-window/Editor/PopupExample.cs
 create mode 100644 create-a-popup-window/Editor/PopupExample.uss
 create mode 100644 create-a-popup-window/Editor/PopupExample.uxml
 create mode 100644 create-a-popup-window/Editor/PopupWindowContent.uxml

diff --git a/create-a-popup-window/Editor/PopupContentExample.cs b/create-a-popup-window/Editor/PopupContentExample.cs
new file mode 100644
index 0000000..e291803
--- /dev/null
+++ b/create-a-popup-window/Editor/PopupContentExample.cs
@@ -0,0 +1,30 @@
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+public class PopupContentExample : PopupWindowContent
+{
+    //Set the window size
+    public override Vector2 GetWindowSize()
+    {
+        return new Vector2(200, 100);
+    }
+
+    public override void OnGUI(Rect rect)
+    {
+        // Intentionally left empty
+    }
+
+    public override void OnOpen()
+    {
+        Debug.Log("Popup opened: " + this);
+
+        var visualTreeAsset = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>("Assets/Editor/PopupWindowContent.uxml");
+        visualTreeAsset.CloneTree(editorWindow.rootVisualElement);
+    }
+        
+    public override void OnClose()
+    {
+        Debug.Log("Popup closed: " + this);
+    }
+}
\ No newline at end of file
diff --git a/create-a-popup-window/Editor/PopupExample.cs b/create-a-popup-window/Editor/PopupExample.cs
new file mode 100644
index 0000000..ae0cea2
--- /dev/null
+++ b/create-a-popup-window/Editor/PopupExample.cs
@@ -0,0 +1,23 @@
+using UnityEditor;
+using UnityEngine.UIElements;
+using PopupWindow = UnityEditor.PopupWindow;
+
+public class PopupExample : EditorWindow
+{
+    // Add menu item
+    [MenuItem("Example/Popup Example")]
+    static void Init()
+    {
+        EditorWindow window = EditorWindow.CreateInstance<PopupExample>();
+        window.Show();
+    }
+
+    private void CreateGUI()
+    {
+        var visualTreeAsset = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>("Assets/Editor/PopupExample.uxml");
+        visualTreeAsset.CloneTree(rootVisualElement);
+
+        var button = rootVisualElement.Q<Button>();
+        button.clicked += () => PopupWindow.Show(button.worldBound, new PopupContentExample());
+    }
+}
\ No newline at end of file
diff --git a/create-a-popup-window/Editor/PopupExample.uss b/create-a-popup-window/Editor/PopupExample.uss
new file mode 100644
index 0000000..0c5a34b
--- /dev/null
+++ b/create-a-popup-window/Editor/PopupExample.uss
@@ -0,0 +1,3 @@
+.popup-button {
+        width: 200px;
+    }
\ No newline at end of file
diff --git a/create-a-popup-window/Editor/PopupExample.uxml b/create-a-popup-window/Editor/PopupExample.uxml
new file mode 100644
index 0000000..9f572b1
--- /dev/null
+++ b/create-a-popup-window/Editor/PopupExample.uxml
@@ -0,0 +1,4 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
+    <Style src="PopupExample.uss" />
+    <ui:Button text="Popup Options" display-tooltip-when-elided="true" class="popup-button" />
+</ui:UXML>
\ No newline at end of file
diff --git a/create-a-popup-window/Editor/PopupWindowContent.uxml b/create-a-popup-window/Editor/PopupWindowContent.uxml
new file mode 100644
index 0000000..517742d
--- /dev/null
+++ b/create-a-popup-window/Editor/PopupWindowContent.uxml
@@ -0,0 +1,6 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
+    <Style src="PopupExample.uss" />
+    <ui:Toggle label="Toggle 1" name="Toggle1"/>
+    <ui:Toggle label="Toggle 2" />
+    <ui:Toggle label="Toggle 3" />
+</ui:UXML>
\ No newline at end of file

From a8ff2038382b8c999152824f70b5833f211791c5 Mon Sep 17 00:00:00 2001
From: lilisha-unity <lisha.li@unity3d.com>
Date: Tue, 11 Oct 2022 16:19:26 +0000
Subject: [PATCH 02/53] Added the pop-up window doc link

---
 README.md | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 27d190a..c2889ca 100644
--- a/README.md
+++ b/README.md
@@ -54,13 +54,20 @@ You must follow the steps in the UI Toolkit user manual to create the examples.
 - [Transition events](https://docs.unity3d.com/Manual/UIE-Transition-Events.html)
 - [Create looping transitions](https://docs.unity3d.com/2022.1/Documentation/Manual/UIE-transition-event-loop-example.html)
 
-# List and tree view examples
+## List and tree view examples
 
 - [Create list and tree views](https://docs.unity3d.com/2022.1/Documentation/Manual/UIE-ListView-TreeView.html)
 - [Create a list view runtime UI](https://docs.unity3d.com/Documentation/Manual/UIE-HowTo-CreateRuntimeUI.html)
 
-# Drag-and-drop UI examples
+## Drag-and-drop UI examples
 
 - [Create a drag-and-drop UI inside a custom Editor window](https://docs.unity3d.com/Documentation/Manual/UIE-create-drag-and-drop-ui.html)
 - [Create a drag-and-drop UI to drag between Editor windows](https://docs.unity3d.com/Documentation/Manual/UIE-drag-across-windows.html)
 
+## Create a pop-up window example
+
+- [Create a pop-up windows](https://docs.unity3d.com/Manual/UIE-create-a-popup-window.html)
+
+
+
+

From fde8801423df91049e9ae895a19c1011e8a14a0c Mon Sep 17 00:00:00 2001
From: lilisha-unity <lisha.li@unity3d.com>
Date: Wed, 12 Oct 2022 20:21:00 +0000
Subject: [PATCH 03/53] Updated popup window and runtime ui example code

---
 .../Editor/PopupWindowContent.uxml            |  1 -
 simple-runtime-ui/SimpleRuntimeUI.cs          | 19 ++++++++++++++-----
 simple-runtime-ui/SimpleRuntimeUI.uxml        |  1 +
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/create-a-popup-window/Editor/PopupWindowContent.uxml b/create-a-popup-window/Editor/PopupWindowContent.uxml
index 517742d..5e90e3f 100644
--- a/create-a-popup-window/Editor/PopupWindowContent.uxml
+++ b/create-a-popup-window/Editor/PopupWindowContent.uxml
@@ -1,5 +1,4 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
-    <Style src="PopupExample.uss" />
     <ui:Toggle label="Toggle 1" name="Toggle1"/>
     <ui:Toggle label="Toggle 2" />
     <ui:Toggle label="Toggle 3" />
diff --git a/simple-runtime-ui/SimpleRuntimeUI.cs b/simple-runtime-ui/SimpleRuntimeUI.cs
index 0361bb6..e123929 100644
--- a/simple-runtime-ui/SimpleRuntimeUI.cs
+++ b/simple-runtime-ui/SimpleRuntimeUI.cs
@@ -8,13 +8,19 @@ public class SimpleRuntimeUI : MonoBehaviour
 
     private int _clickCount;
 
+    //Add logic that interacts with the UI controls in the `OnEnable` methods
     private void OnEnable()
     {
+        // The UXML is already instantiated by the UIDocument component
         var uiDocument = GetComponent<UIDocument>();
-        _button = uiDocument.rootVisualElement.Q<Button>();
-        _toggle = uiDocument.rootVisualElement.Q<Toggle>();
+
+        _button = uiDocument.rootVisualElement.Q("button");
+        _toggle = uiDocument.rootVisualElement.Q("toggle");
 
         _button.RegisterCallback<ClickEvent>(PrintClickMessage);
+
+        var _inputFields = uiDocument.rootVisualElement.Q("input-message");
+        _inputFields.RegisterCallback<ChangeEvent<string>>(InputMessage);
     }
 
     private void OnDisable()
@@ -26,9 +32,12 @@ private void PrintClickMessage(ClickEvent evt)
     {
         ++_clickCount;
 
-        var button = evt.currentTarget as Button;
+        Debug.Log($"{"button"} was clicked!" +
+                (_toggle.value ? " Count: " + _clickCount : ""));
+    }
 
-        Debug.Log($"{button.name} was clicked!" +
-                  (_toggle.value ? " Count: " + _clickCount : ""));
+    public static void InputMessage(ChangeEvent<string> evt)
+    {
+        Debug.Log($"{evt.newValue} -> {evt.target}");
     }
 }
\ No newline at end of file
diff --git a/simple-runtime-ui/SimpleRuntimeUI.uxml b/simple-runtime-ui/SimpleRuntimeUI.uxml
index 08aa56b..be50412 100644
--- a/simple-runtime-ui/SimpleRuntimeUI.uxml
+++ b/simple-runtime-ui/SimpleRuntimeUI.uxml
@@ -3,5 +3,6 @@
         <ui:Label text="This is a Label" display-tooltip-when-elided="true" />
         <ui:Button text="This is a Button" display-tooltip-when-elided="true" name="button" />
         <ui:Toggle label="Display the counter?" name="toggle" />
+        <ui:TextField picking-mode="Ignore" label="Text Field" value="filler text" text="filler text" name="input-message" />
     </ui:VisualElement>
 </ui:UXML>

From e7adf37642a3163d32162b55aad03a151f1f81a2 Mon Sep 17 00:00:00 2001
From: lilisha-unity <lisha.li@unity3d.com>
Date: Tue, 1 Nov 2022 17:01:59 +0000
Subject: [PATCH 04/53] Fixed code errors according to user feedback

---
 simple-runtime-ui/SimpleRuntimeUI.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/simple-runtime-ui/SimpleRuntimeUI.cs b/simple-runtime-ui/SimpleRuntimeUI.cs
index e123929..532315c 100644
--- a/simple-runtime-ui/SimpleRuntimeUI.cs
+++ b/simple-runtime-ui/SimpleRuntimeUI.cs
@@ -14,8 +14,8 @@ private void OnEnable()
         // The UXML is already instantiated by the UIDocument component
         var uiDocument = GetComponent<UIDocument>();
 
-        _button = uiDocument.rootVisualElement.Q("button");
-        _toggle = uiDocument.rootVisualElement.Q("toggle");
+        _button = uiDocument.rootVisualElement.Q("button") as Button;
+        _toggle = uiDocument.rootVisualElement.Q("toggle") as Toggle;
 
         _button.RegisterCallback<ClickEvent>(PrintClickMessage);
 

From 0a6c73685b363a55dae6c763db7d7239f136c9a3 Mon Sep 17 00:00:00 2001
From: lilisha-unity <lisha.li@unity3d.com>
Date: Wed, 9 Nov 2022 00:18:02 +0000
Subject: [PATCH 05/53] Added relative and absolute example code

---
 README.md                                     |  1 +
 .../Editor/PositioningTestWindow.cs           | 45 +++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 relative-and-absolute-position/Editor/PositioningTestWindow.cs

diff --git a/README.md b/README.md
index c2889ca..1e867fa 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,7 @@ You must follow the steps in the UI Toolkit user manual to create the examples.
 ## Editor UI examples
 
 - [Get started with UI Toolkit](https://docs.unity3d.com/Documentation/Manual/UIE-simple-ui-toolkit-workflow.html)
+- [Relative and absolute positioning C# example](https://docs.unity3d.com/Manual/UIE-relative-absolute-positioning-example.html)
 
 ## Runtime UI examples
 
diff --git a/relative-and-absolute-position/Editor/PositioningTestWindow.cs b/relative-and-absolute-position/Editor/PositioningTestWindow.cs
new file mode 100644
index 0000000..e2b8ea1
--- /dev/null
+++ b/relative-and-absolute-position/Editor/PositioningTestWindow.cs
@@ -0,0 +1,45 @@
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+public class PositioningTestWindow : EditorWindow
+{
+    [MenuItem("Window/UI Toolkit/Positioning Test Window")]
+    public static void ShowExample()
+    {
+        var wnd = GetWindow<PositioningTestWindow>();
+        wnd.titleContent = new GUIContent("Positioning Test Window");
+    }
+
+    public void CreateGUI()
+    {
+        for (int i = 0; i < 4; i++)
+        {
+            var temp = new VisualElement();
+            temp.style.width = 70;
+            temp.style.height = 70;
+            temp.style.marginBottom = 2;
+            temp.style.backgroundColor = Color.gray;
+            rootVisualElement.Add(temp);
+        }
+
+        // Relative positioning
+        var relative = new Label("Relative\nPos\n25, 0");
+        relative.style.width = 70;
+        relative.style.height = 70;
+        relative.style.left = 25;
+        relative.style.marginBottom = 2;
+        relative.style.backgroundColor = new Color(0.2165094f, 0, 0.254717f);
+        rootVisualElement.Add(relative);
+
+        // Absolute positioning
+        var absolutePositionElement = new Label("Absolute\nPos\n25, 25");
+        absolutePositionElement.style.position = Position.Absolute;
+        absolutePositionElement.style.top = 25;
+        absolutePositionElement.style.left = 25;
+        absolutePositionElement.style.width = 70;
+        absolutePositionElement.style.height = 70;
+        absolutePositionElement.style.backgroundColor = Color.black;
+        rootVisualElement.Add(absolutePositionElement);
+    }
+}
\ No newline at end of file

From c16a941f0ce7c6333ab2cc0ec8cdac1ddecbf450 Mon Sep 17 00:00:00 2001
From: lilisha-unity <lisha.li@unity3d.com>
Date: Tue, 15 Nov 2022 16:23:29 +0000
Subject: [PATCH 06/53] Added ScrollView code example

---
 .../Editor/ScrollViewExample.cs               | 35 +++++++++++++++++++
 .../Editor/ScrollViewExample.uss              | 18 ++++++++++
 .../Editor/ScrollViewExample.uxml             |  9 +++++
 3 files changed, 62 insertions(+)
 create mode 100644 wrap-content-inside-scrollview/Editor/ScrollViewExample.cs
 create mode 100644 wrap-content-inside-scrollview/Editor/ScrollViewExample.uss
 create mode 100644 wrap-content-inside-scrollview/Editor/ScrollViewExample.uxml

diff --git a/wrap-content-inside-scrollview/Editor/ScrollViewExample.cs b/wrap-content-inside-scrollview/Editor/ScrollViewExample.cs
new file mode 100644
index 0000000..c92e1e3
--- /dev/null
+++ b/wrap-content-inside-scrollview/Editor/ScrollViewExample.cs
@@ -0,0 +1,35 @@
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+using UnityEditor.UIElements;
+
+public class ScrollViewExample : EditorWindow
+{
+    [MenuItem("Example/ScrollView Wrapping Example")]
+    public static void ShowExample()
+    {
+        var wnd = GetWindow<ScrollViewExample>();
+    }
+
+    public void CreateGUI()
+    {
+        // Each editor window contains a root VisualElement object.
+        VisualElement root = rootVisualElement;
+
+        // Import UXML.
+        var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>("Assets/Editor/ScrollViewExample.uxml");
+        VisualElement ScrollViewExample = visualTree.Instantiate();
+        root.Add(ScrollViewExample);
+
+        // Find the scroll view by name.
+        VisualElement scrollview = root.Query<ScrollView>("scroll-view-wrap-example");
+            
+        // Add 15 buttons inside the scroll view.
+        for (int i = 0; i < 15; i++) 
+        {
+            Button button = new Button();
+            button.text = "Button";
+            scrollview.Add(button);
+        }
+    }
+}
\ No newline at end of file
diff --git a/wrap-content-inside-scrollview/Editor/ScrollViewExample.uss b/wrap-content-inside-scrollview/Editor/ScrollViewExample.uss
new file mode 100644
index 0000000..2a743d4
--- /dev/null
+++ b/wrap-content-inside-scrollview/Editor/ScrollViewExample.uss
@@ -0,0 +1,18 @@
+Label {
+    font-size: 20px;
+    -unity-font-style: bold;
+    color: rgb(68, 138, 255);
+    /* Style to wrap text of the label */
+    white-space: normal;
+}
+
+/* Style to wrap elements inside the scroll view */
+#scroll-view-wrap-example .unity-scroll-view__content-container {
+    flex-direction: row;
+    flex-wrap: wrap;
+}
+
+Button {
+    width: 50px;
+    height: 50px;
+}
\ No newline at end of file
diff --git a/wrap-content-inside-scrollview/Editor/ScrollViewExample.uxml b/wrap-content-inside-scrollview/Editor/ScrollViewExample.uxml
new file mode 100644
index 0000000..409d2f4
--- /dev/null
+++ b/wrap-content-inside-scrollview/Editor/ScrollViewExample.uxml
@@ -0,0 +1,9 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
+    <Style src="ScrollViewExample.uss" />
+    <ui:ScrollView>
+        <ui:VisualElement>
+            <ui:Label text="ScrollView Wrapping Example" />
+        </ui:VisualElement>
+    </ui:ScrollView>
+    <ui:ScrollView name="scroll-view-wrap-example" />
+</ui:UXML>
\ No newline at end of file

From f03ffbcaf6330e8768709313e237ecdc89cf111b Mon Sep 17 00:00:00 2001
From: lilisha-unity <lisha.li@unity3d.com>
Date: Tue, 15 Nov 2022 16:28:46 +0000
Subject: [PATCH 07/53] Updated Readme to add ScrollView doc link and reorg the
 page

---
 README.md | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 1e867fa..9c64f3d 100644
--- a/README.md
+++ b/README.md
@@ -14,10 +14,6 @@ You must follow the steps in the UI Toolkit user manual to create the examples.
 - [Get started with runtime UI](https://docs.unity3d.com/Documentation/Manual/UIE-get-started-with-runtime-ui.html)
 
 
-## Tabbed menu examples
-
-- [Create a tabbed menu for runtime](https://docs.unity3d.com/Documentation/Manual/UIE-create-tabbed-menu-for-runtime.html)
-
 ## Custom controls examples
 
 - [Create a slide toggle custom control](https://docs.unity3d.com/Documentation/Manual/UIE-slide-toggle.html)
@@ -43,11 +39,15 @@ You must follow the steps in the UI Toolkit user manual to create the examples.
 - [Bind a custom control](https://docs.unity3d.com/Documentation/Manual/UIE-bind-custom-control.html)
 - [Bind a custom control to custom data type](https://docs.unity3d.com/Documentation/Manual/UIE-bind-to-custom-data-type.html)
 
-## UXML element examples
+## UI controls examples
 
 - [Toggle](https://docs.unity3d.com/Manual/UIE-uxml-element-Toggle.html)
 - [ListView](https://docs.unity3d.com/Manual/UIE-uxml-element-ListView.html)
-
+- [Wrap content inside a scroll view](https://docs.unity3d.com/Manual/UIE-wrap-content-inside-scrollview.html)
+- [Create list and tree views](https://docs.unity3d.com/2022.1/Documentation/Manual/UIE-ListView-TreeView.html)
+- [Create a list view runtime UI](https://docs.unity3d.com/Documentation/Manual/UIE-HowTo-CreateRuntimeUI.html)
+- [Create a pop-up windows](https://docs.unity3d.com/Manual/UIE-create-a-popup-window.html)
+- [Create a tabbed menu for runtime](https://docs.unity3d.com/Documentation/Manual/UIE-create-tabbed-menu-for-runtime.html)
 
 ## Transition examples
 
@@ -55,20 +55,12 @@ You must follow the steps in the UI Toolkit user manual to create the examples.
 - [Transition events](https://docs.unity3d.com/Manual/UIE-Transition-Events.html)
 - [Create looping transitions](https://docs.unity3d.com/2022.1/Documentation/Manual/UIE-transition-event-loop-example.html)
 
-## List and tree view examples
-
-- [Create list and tree views](https://docs.unity3d.com/2022.1/Documentation/Manual/UIE-ListView-TreeView.html)
-- [Create a list view runtime UI](https://docs.unity3d.com/Documentation/Manual/UIE-HowTo-CreateRuntimeUI.html)
 
 ## Drag-and-drop UI examples
 
 - [Create a drag-and-drop UI inside a custom Editor window](https://docs.unity3d.com/Documentation/Manual/UIE-create-drag-and-drop-ui.html)
 - [Create a drag-and-drop UI to drag between Editor windows](https://docs.unity3d.com/Documentation/Manual/UIE-drag-across-windows.html)
 
-## Create a pop-up window example
-
-- [Create a pop-up windows](https://docs.unity3d.com/Manual/UIE-create-a-popup-window.html)
-
 
 
 

From 0993404f20a20a343dd27e346c4f3126de1725a7 Mon Sep 17 00:00:00 2001
From: lilisha-unity <lisha.li@unity3d.com>
Date: Thu, 22 Dec 2022 19:55:26 +0000
Subject: [PATCH 08/53] Added custom control with custom attributes example
 code

---
 README.md                                     |  5 ++--
 .../MyElement.cs                              | 30 +++++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 create-custom-control-with-custom-attributes/MyElement.cs

diff --git a/README.md b/README.md
index 9c64f3d..5d3cb5e 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,7 @@ You must follow the steps in the UI Toolkit user manual to create the examples.
 - [Create a radial progress indicator](https://docs.unity3d.com/Documentation/Manual/UIE-radial-progress.html)
 - [Create a bindable custom control](https://docs.unity3d.com/Documentation/Manual/UIE-create-bindable-custom-control.html)
 - [Create a custom style for a custom control](https://docs.unity3d.com/Documentation/Manual/UIE-create-custom-style-custom-control.html)
+- [Create a custom control with two attributes](https://docs.unity3d.com/Manual/UIB-structuring-ui-custom-elements.html)
 
 ## Basic binding examples
 
@@ -41,10 +42,10 @@ You must follow the steps in the UI Toolkit user manual to create the examples.
 
 ## UI controls examples
 
-- [Toggle](https://docs.unity3d.com/Manual/UIE-uxml-element-Toggle.html)
-- [ListView](https://docs.unity3d.com/Manual/UIE-uxml-element-ListView.html)
+- [Use Toggle to create a conditional UI](https://docs.unity3d.com/Documentation/Manual/UIE-create-a-conditional-ui.html)
 - [Wrap content inside a scroll view](https://docs.unity3d.com/Manual/UIE-wrap-content-inside-scrollview.html)
 - [Create list and tree views](https://docs.unity3d.com/2022.1/Documentation/Manual/UIE-ListView-TreeView.html)
+- [Create a complex list view](https://docs.unity3d.com/2022.1/Documentation/Manual/UIE-create-list-view-complex.html)
 - [Create a list view runtime UI](https://docs.unity3d.com/Documentation/Manual/UIE-HowTo-CreateRuntimeUI.html)
 - [Create a pop-up windows](https://docs.unity3d.com/Manual/UIE-create-a-popup-window.html)
 - [Create a tabbed menu for runtime](https://docs.unity3d.com/Documentation/Manual/UIE-create-tabbed-menu-for-runtime.html)
diff --git a/create-custom-control-with-custom-attributes/MyElement.cs b/create-custom-control-with-custom-attributes/MyElement.cs
new file mode 100644
index 0000000..30f34d0
--- /dev/null
+++ b/create-custom-control-with-custom-attributes/MyElement.cs
@@ -0,0 +1,30 @@
+using UnityEngine;
+using UnityEngine.UIElements;
+
+class MyElement : VisualElement
+{
+    public new class UxmlFactory : UxmlFactory<MyElement, UxmlTraits> { }
+
+    // Add the two custom UXML attributes.
+    public new class UxmlTraits : VisualElement.UxmlTraits
+    {
+        UxmlStringAttributeDescription m_String =
+            new UxmlStringAttributeDescription { name = "my-string", defaultValue = "default_value" };
+        UxmlIntAttributeDescription m_Int =
+            new UxmlIntAttributeDescription { name = "my-int", defaultValue = 2 };
+            
+        public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext cc)
+        {
+            base.Init(ve, bag, cc);
+            var ate = ve as MyElement;
+
+            ate.myString = m_String.GetValueFromBag(bag, cc);
+            ate.myInt = m_Int.GetValueFromBag(bag, cc);
+        }
+    }
+        
+    // Must expose your element class to a { get; set; } property that has the same name 
+    // as the name you set in your UXML attribute description with the camel case format
+    public string myString { get; set; }
+    public int myInt { get; set; }
+}
\ No newline at end of file

From 705ed0d62cef7dbfdcd836ec3348e19b77ce4a2c Mon Sep 17 00:00:00 2001
From: lilisha-unity <lisha.li@unity3d.com>
Date: Tue, 3 Jan 2023 17:53:14 +0000
Subject: [PATCH 09/53] Added radial-progress-vector-api example code

---
 radial-progress-vector-api/RadialProgress.cs  | 126 ++++++++++++++++++
 radial-progress-vector-api/RadialProgress.uss |  20 +++
 .../RadialProgressComponent.cs                |  25 ++++
 .../RadialProgressExample.uxml                |   6 +
 radial-progress/RadialProgress.uss            |   2 +
 radial-progress/RadialProgressComponent.cs    |  25 ++++
 radial-progress/RadialProgressExample.uxml    |   3 +-
 7 files changed, 206 insertions(+), 1 deletion(-)
 create mode 100644 radial-progress-vector-api/RadialProgress.cs
 create mode 100644 radial-progress-vector-api/RadialProgress.uss
 create mode 100644 radial-progress-vector-api/RadialProgressComponent.cs
 create mode 100644 radial-progress-vector-api/RadialProgressExample.uxml
 create mode 100644 radial-progress/RadialProgressComponent.cs

diff --git a/radial-progress-vector-api/RadialProgress.cs b/radial-progress-vector-api/RadialProgress.cs
new file mode 100644
index 0000000..c1a095a
--- /dev/null
+++ b/radial-progress-vector-api/RadialProgress.cs
@@ -0,0 +1,126 @@
+using Unity.Collections;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace MyUILibrary
+{
+
+    // An element that displays progress inside a partially filled circle
+    public class RadialProgress : VisualElement
+    {
+        public new class UxmlTraits : VisualElement.UxmlTraits
+        {
+            // The progress property is exposed to UXML.
+            UxmlFloatAttributeDescription m_ProgressAttribute = new UxmlFloatAttributeDescription()
+            {
+                name = "progress"
+            };
+
+            // Use the Init method to assign the value of the progress UXML attribute to the C# progress property.
+            public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext cc)
+            {
+                base.Init(ve, bag, cc);
+
+                (ve as RadialProgress).progress = m_ProgressAttribute.GetValueFromBag(bag, cc);
+            }
+        }
+
+        // Define a factory class to expose this control to UXML.
+        public new class UxmlFactory : UxmlFactory<RadialProgress, UxmlTraits> { }
+
+        // These are USS class names for the control overall and the label.
+        public static readonly string ussClassName = "radial-progress";
+        public static readonly string ussLabelClassName = "radial-progress__label";
+
+        // These objects allow C# code to access custom USS properties.
+        static CustomStyleProperty<Color> s_TrackColor = new CustomStyleProperty<Color>("--track-color");
+        static CustomStyleProperty<Color> s_ProgressColor = new CustomStyleProperty<Color>("--progress-color");
+
+        Color m_TrackColor = Color.gray;
+        Color m_ProgressColor = Color.red;
+
+        // This is the label that displays the percentage.
+        Label m_Label;
+
+        // This is the number that the Label displays as a percentage.
+        float m_Progress;
+
+        // A value between 0 and 100
+        public float progress
+        {
+            // The progress property is exposed in C#.
+            get => m_Progress;
+            set
+            {
+                // Whenever the progress property changes, MarkDirtyRepaint() is named. This causes a call to the
+                // generateVisualContents callback.
+                m_Progress = value;
+                m_Label.text = Mathf.Clamp(Mathf.Round(value), 0, 100) + "%";
+                MarkDirtyRepaint();
+            }
+        }
+
+        // This default constructor is RadialProgress's only constructor.
+        public RadialProgress()
+        {
+            // Create a Label, add a USS class name, and add it to this visual tree.
+            m_Label = new Label();
+            m_Label.AddToClassList(ussLabelClassName);
+            Add(m_Label);
+
+            // Add the USS class name for the overall control.
+            AddToClassList(ussClassName);
+
+            // Register a callback after custom style resolution.
+            RegisterCallback<CustomStyleResolvedEvent>(evt => CustomStylesResolved(evt));
+
+            // Register a callback to generate the visual content of the control.
+            generateVisualContent += GenerateVisualContent;
+
+            progress = 0.0f;
+        }
+
+        static void CustomStylesResolved(CustomStyleResolvedEvent evt)
+        {
+            RadialProgress element = (RadialProgress)evt.currentTarget;
+            element.UpdateCustomStyles();
+        }
+
+        // After the custom colors are resolved, this method uses them to color the meshes and (if necessary) repaint
+        // the control.
+        void UpdateCustomStyles()
+        {
+            bool repaint = false;
+            if (customStyle.TryGetValue(s_ProgressColor, out m_ProgressColor))
+                repaint = true;
+
+            if (customStyle.TryGetValue(s_TrackColor, out m_TrackColor))
+                repaint = true;
+
+            if (repaint)
+                MarkDirtyRepaint();
+        }
+
+        void GenerateVisualContent(MeshGenerationContext context)
+        {
+            float width = contentRect.width;
+            float height = contentRect.height;
+
+            var painter = context.painter2D;
+            painter.lineWidth = 10.0f;
+            painter.lineCap = LineCap.Butt;
+
+            // Draw the track
+            painter.strokeColor = m_TrackColor;
+            painter.BeginPath();
+            painter.Arc(new Vector2(width * 0.5f, height * 0.5f), width * 0.5f, 0.0f, 360.0f);
+            painter.Stroke();
+
+            // Draw the progress
+            painter.strokeColor = m_ProgressColor;
+            painter.BeginPath();
+            painter.Arc(new Vector2(width * 0.5f, height * 0.5f), width * 0.5f, -90.0f, 360.0f * (progress / 100.0f) - 90.0f);
+            painter.Stroke();
+        }
+    }
+}    
\ No newline at end of file
diff --git a/radial-progress-vector-api/RadialProgress.uss b/radial-progress-vector-api/RadialProgress.uss
new file mode 100644
index 0000000..b77950a
--- /dev/null
+++ b/radial-progress-vector-api/RadialProgress.uss
@@ -0,0 +1,20 @@
+.radial-progress {
+    min-width: 26px;
+    min-height: 20px;
+    --track-color: rgb(130, 130, 130);
+    --progress-color: rgb(46, 132, 24);
+    --percentage-color: white;
+    margin-left: 5px;
+    margin-right: 5px;
+    margin-top: 5px;
+    margin-bottom: 5px;
+    flex-direction: row;
+    justify-content: center;
+    width: 100px; 
+    height: 100px;
+}
+
+.radial-progress__label {
+    -unity-text-align: middle-left;
+    color: var(--percentage-color);
+}
\ No newline at end of file
diff --git a/radial-progress-vector-api/RadialProgressComponent.cs b/radial-progress-vector-api/RadialProgressComponent.cs
new file mode 100644
index 0000000..c863e15
--- /dev/null
+++ b/radial-progress-vector-api/RadialProgressComponent.cs
@@ -0,0 +1,25 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UIElements;
+using MyUILibrary;
+
+[RequireComponent(typeof(UIDocument))]
+public class RadialProgressComponent : MonoBehaviour
+{
+
+    RadialProgress m_RadialProgress;
+
+    void start()
+    {
+        var root = GetComponent<UIDocument>().rootVisualElement;
+        // Find the custom control by name.
+        m_RadialProgress = root.Q("radial-progress") as RadialProgress;
+    }
+
+    void Update()
+    {
+        // For demo purpose, give the progress property dynamic values.
+        m_RadialProgress.progress = ((Mathf.Sin(Time.time) + 1.0f) / 2.0f) * 60.0f + 10.0f;
+    }
+}
\ No newline at end of file
diff --git a/radial-progress-vector-api/RadialProgressExample.uxml b/radial-progress-vector-api/RadialProgressExample.uxml
new file mode 100644
index 0000000..94cfae9
--- /dev/null
+++ b/radial-progress-vector-api/RadialProgressExample.uxml
@@ -0,0 +1,6 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
+    <Style src="RadialProgress.uss"/>
+    <ui:VisualElement style="align-items: center;">
+        <MyUILibrary.RadialProgress progress="87.1" />
+    </ui:VisualElement>
+</ui:UXML>
\ No newline at end of file
diff --git a/radial-progress/RadialProgress.uss b/radial-progress/RadialProgress.uss
index 39b8037..efcbe88 100644
--- a/radial-progress/RadialProgress.uss
+++ b/radial-progress/RadialProgress.uss
@@ -10,6 +10,8 @@
         margin-bottom: 5px;
         flex-direction: row;
         justify-content: center;
+        width: 100px; 
+        height: 100px;
     }
 
     .radial-progress__label {
diff --git a/radial-progress/RadialProgressComponent.cs b/radial-progress/RadialProgressComponent.cs
new file mode 100644
index 0000000..c863e15
--- /dev/null
+++ b/radial-progress/RadialProgressComponent.cs
@@ -0,0 +1,25 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UIElements;
+using MyUILibrary;
+
+[RequireComponent(typeof(UIDocument))]
+public class RadialProgressComponent : MonoBehaviour
+{
+
+    RadialProgress m_RadialProgress;
+
+    void start()
+    {
+        var root = GetComponent<UIDocument>().rootVisualElement;
+        // Find the custom control by name.
+        m_RadialProgress = root.Q("radial-progress") as RadialProgress;
+    }
+
+    void Update()
+    {
+        // For demo purpose, give the progress property dynamic values.
+        m_RadialProgress.progress = ((Mathf.Sin(Time.time) + 1.0f) / 2.0f) * 60.0f + 10.0f;
+    }
+}
\ No newline at end of file
diff --git a/radial-progress/RadialProgressExample.uxml b/radial-progress/RadialProgressExample.uxml
index 71c39bd..94cfae9 100644
--- a/radial-progress/RadialProgressExample.uxml
+++ b/radial-progress/RadialProgressExample.uxml
@@ -1,5 +1,6 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
+    <Style src="RadialProgress.uss"/>
     <ui:VisualElement style="align-items: center;">
-        <MyUILibrary.RadialProgress progress="87.1" style="width: 100px; height: 100px;" />
+        <MyUILibrary.RadialProgress progress="87.1" />
     </ui:VisualElement>
 </ui:UXML>
\ No newline at end of file

From 70613fe1af3d72518ec3019c3363bc1919918ef9 Mon Sep 17 00:00:00 2001
From: lilisha-unity <lisha.li@unity3d.com>
Date: Tue, 3 Jan 2023 20:25:11 +0000
Subject: [PATCH 10/53] Added pie chart example code

---
 pie-chart/Editor/PieChartWindow.cs | 20 +++++++++
 pie-chart/PieChart.cs              | 68 ++++++++++++++++++++++++++++++
 pie-chart/PieChartComponet.cs      | 16 +++++++
 3 files changed, 104 insertions(+)
 create mode 100644 pie-chart/Editor/PieChartWindow.cs
 create mode 100644 pie-chart/PieChart.cs
 create mode 100644 pie-chart/PieChartComponet.cs

diff --git a/pie-chart/Editor/PieChartWindow.cs b/pie-chart/Editor/PieChartWindow.cs
new file mode 100644
index 0000000..7d1f889
--- /dev/null
+++ b/pie-chart/Editor/PieChartWindow.cs
@@ -0,0 +1,20 @@
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+public class PieChartWindow : EditorWindow
+{
+    [MenuItem("Tools/PieChart Window")]
+    public static void ShowExample()
+    {
+        PieChartWindow wnd = GetWindow<PieChartWindow>();
+        wnd.titleContent = new GUIContent("PieChartWindow");
+    }
+
+    public void CreateGUI()
+    {
+        VisualElement root = rootVisualElement;
+            
+        root.Add(new PieChart());
+    }
+}
\ No newline at end of file
diff --git a/pie-chart/PieChart.cs b/pie-chart/PieChart.cs
new file mode 100644
index 0000000..fc8b14f
--- /dev/null
+++ b/pie-chart/PieChart.cs
@@ -0,0 +1,68 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+public class PieChart : VisualElement
+{
+    float m_Radius = 100.0f;
+    float m_Value = 40.0f;
+
+    VisualElement m_Chart;
+
+    public float radius
+    {
+        get => m_Radius;
+        set
+        {
+            m_Radius = value;
+            m_Chart.style.height = diameter;
+            m_Chart.style.width = diameter;
+            m_Chart.MarkDirtyRepaint();
+        }
+    }
+
+    public float diameter => m_Radius * 2.0f;
+
+    public float value {
+        get { return m_Value; }
+        set { m_Value = value; MarkDirtyRepaint(); }
+    }
+
+    public PieChart()
+    {
+        generateVisualContent += DrawCanvas;
+    }
+
+    void DrawCanvas(MeshGenerationContext ctx)
+    {
+        var painter = ctx.painter2D;
+        painter.strokeColor = Color.white;
+        painter.fillColor = Color.white;
+
+        var percentage = m_Value;
+
+        var percentages = new float[] {
+            percentage, 100 - percentage
+        };
+        var colors = new Color32[] {
+            new Color32(182,235,122,255),
+            new Color32(251,120,19,255)
+        };
+        float angle = 0.0f;
+        float anglePct = 0.0f;
+        int k = 0;
+        foreach (var pct in percentages)
+        {
+            anglePct += 360.0f * (pct / 100);
+
+            painter.fillColor = colors[k++];
+            painter.BeginPath();
+            painter.MoveTo(new Vector2(m_Radius, m_Radius));
+            painter.Arc(new Vector2(m_Radius, m_Radius), m_Radius, angle, anglePct);
+            painter.Fill();
+
+            angle = anglePct;
+        }
+    }
+}
\ No newline at end of file
diff --git a/pie-chart/PieChartComponet.cs b/pie-chart/PieChartComponet.cs
new file mode 100644
index 0000000..f6cf38e
--- /dev/null
+++ b/pie-chart/PieChartComponet.cs
@@ -0,0 +1,16 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+[RequireComponent(typeof(UIDocument))]
+public class PieChartComponent : MonoBehaviour
+{
+    PieChart m_PieChart;
+
+    void Start()
+    {
+        m_PieChart = new PieChart();
+        GetComponent<UIDocument>().rootVisualElement.Add(m_PieChart);
+    }
+}
\ No newline at end of file

From b5b00e88a1d491e07108cfa8934179bd9f0cc0f7 Mon Sep 17 00:00:00 2001
From: lilisha-unity <lisha.li@unity3d.com>
Date: Tue, 3 Jan 2023 20:27:32 +0000
Subject: [PATCH 11/53] Added vector API documentation link in the readme file

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 5d3cb5e..40f490f 100644
--- a/README.md
+++ b/README.md
@@ -62,6 +62,9 @@ You must follow the steps in the UI Toolkit user manual to create the examples.
 - [Create a drag-and-drop UI inside a custom Editor window](https://docs.unity3d.com/Documentation/Manual/UIE-create-drag-and-drop-ui.html)
 - [Create a drag-and-drop UI to drag between Editor windows](https://docs.unity3d.com/Documentation/Manual/UIE-drag-across-windows.html)
 
+## Vector UI examples
 
+- [Create a pie chart in the Editor and runtime UI](https://docs.unity3d.com/2022.2/Documentation/Manual/UIE-pie-chart.html)
+- [Use Vector API to create a radial progress indicator](https://docs.unity3d.com/2022.2/Documentation/Manual/UIE-radial-progress-use-vector-api.html)
 
 

From ccff2205fd725754a4e95cf7bfa455e3e107a57a Mon Sep 17 00:00:00 2001
From: lilisha-unity <lisha.li@unity3d.com>
Date: Thu, 5 Jan 2023 22:25:51 +0000
Subject: [PATCH 12/53] Updated to make code consistent for the simple UI
 Toolkit example

---
 simple-ui-toolkit-workflow/MyCustomEditor.cs | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/simple-ui-toolkit-workflow/MyCustomEditor.cs b/simple-ui-toolkit-workflow/MyCustomEditor.cs
index 95ad530..6d4d653 100644
--- a/simple-ui-toolkit-workflow/MyCustomEditor.cs
+++ b/simple-ui-toolkit-workflow/MyCustomEditor.cs
@@ -23,26 +23,26 @@ public void CreateGUI()
         // Each editor window contains a root VisualElement object
         VisualElement root = rootVisualElement;
 
-        // VisualElements objects can contain other VisualElement following a tree hierarchy.
+        // VisualElements objects can contain other VisualElements following a tree hierarchy.
         Label label = new Label("These controls were created using C# code.");
         root.Add(label);
 
         Button button = new Button();
         button.name = "button3";
         button.text = "This is button3.";
-        rootVisualElement.Add(button);
+        root.Add(button);
 
         Toggle toggle = new Toggle();
         toggle.name = "toggle3";
         toggle.label = "Number?";
-        rootVisualElement.Add(toggle);
+        root.Add(toggle);
 
         // Import UXML
         var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>("Assets/Editor/MyCustomEditor.uxml");
         VisualElement labelFromUXML = visualTree.Instantiate();
         root.Add(labelFromUXML);
 
-        rootVisualElement.Add(m_UXMLTree.Instantiate());
+        root.Add(m_UXMLTree.Instantiate());
 
         //Call the event handler
         SetupButtonHandler();
@@ -51,7 +51,9 @@ public void CreateGUI()
     //Functions as the event handlers for your button click and number counts 
     private void SetupButtonHandler()
     {
-        var buttons = rootVisualElement.Query<Button>();
+        VisualElement root = rootVisualElement;
+
+        var buttons = root.Query<Button>();
         buttons.ForEach(RegisterHandler);
     }
 
@@ -62,6 +64,8 @@ private void RegisterHandler(Button button)
 
     private void PrintClickMessage(ClickEvent evt)
     {
+        VisualElement root = rootVisualElement;
+
         ++m_ClickCount;
 
         //Because of the names we gave the buttons and toggles, we can use the
@@ -69,7 +73,7 @@ private void PrintClickMessage(ClickEvent evt)
         Button button = evt.currentTarget as Button;
         string buttonNumber = button.name.Substring(m_ButtonPrefix.Length);
         string toggleName = "toggle" + buttonNumber;
-        Toggle toggle = rootVisualElement.Q<Toggle>(toggleName);
+        Toggle toggle = root.Q<Toggle>(toggleName);
 
         Debug.Log("Button was clicked!" +
             (toggle.value ? " Count: " + m_ClickCount : ""));

From 6a1450e68fb85e492337114c2d5e67d40654af24 Mon Sep 17 00:00:00 2001
From: Lisha Li <lisha.li@unity3d.com>
Date: Fri, 20 Jan 2023 09:28:21 -0800
Subject: [PATCH 13/53] Updated according to documentation change

---
 .../TabbedMenu-style.uss                      |  2 --
 .../TabbedMenu-template.uxml                  | 20 +++++++++-------
 .../PositioningTest.uss                       | 24 +++++++++++++++++++
 .../PositioningTest.uxml                      | 11 +++++++++
 .../PostioningTestRuntime.cs                  | 14 +++++++++++
 5 files changed, 60 insertions(+), 11 deletions(-)
 create mode 100644 relative-and-absolute-position/PositioningTest.uss
 create mode 100644 relative-and-absolute-position/PositioningTest.uxml
 create mode 100644 relative-and-absolute-position/PostioningTestRuntime.cs

diff --git a/create-a-tabbed-menu-for-runtime/TabbedMenu-style.uss b/create-a-tabbed-menu-for-runtime/TabbedMenu-style.uss
index 05d9553..c1a62c1 100644
--- a/create-a-tabbed-menu-for-runtime/TabbedMenu-style.uss
+++ b/create-a-tabbed-menu-for-runtime/TabbedMenu-style.uss
@@ -1,6 +1,5 @@
 /* Style for tabs */
 #tabs {
-    flex-basis: 10%;
     flex-direction: row;
     background-color: rgb(229, 223, 223);
     font-size: 12px;
@@ -20,7 +19,6 @@
 
 /* Style for tabContent */
 #tabContent {
-    flex-basis: 90%;
     background-color: rgb(255, 255, 255);
     font-size: 20px;
 }
diff --git a/create-a-tabbed-menu-for-runtime/TabbedMenu-template.uxml b/create-a-tabbed-menu-for-runtime/TabbedMenu-template.uxml
index 56d47af..4f855bc 100644
--- a/create-a-tabbed-menu-for-runtime/TabbedMenu-template.uxml
+++ b/create-a-tabbed-menu-for-runtime/TabbedMenu-template.uxml
@@ -1,13 +1,15 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
     <Style src="TabbedMenu-style.uss" />
-    <ui:VisualElement name="tabs">
-        <ui:Label name="LondonTab" text="London" class="tab currentlySelectedTab" />
-        <ui:Label name="ParisTab" text="Paris" class="tab" />
-        <ui:Label name="OttawaTab" text="Ottawa" class="tab" />
-    </ui:VisualElement>
-    <ui:VisualElement name="tabContent">
-        <ui:Label text="London is the capital city of England" name="LondonContent" />
-        <ui:Label text="Paris is the capital of France" name="ParisContent" class="unselectedContent" />
-        <ui:Label text="Ottawa is the capital of Canada" name="OttawaContent" class="unselectedContent" />
+    <ui:VisualElement>
+        <ui:VisualElement name="tabs">
+            <ui:Label name="LondonTab" text="London" class="tab currentlySelectedTab" />
+            <ui:Label name="ParisTab" text="Paris" class="tab" />
+            <ui:Label name="OttawaTab" text="Ottawa" class="tab" />
+        </ui:VisualElement>
+        <ui:VisualElement name="tabContent">
+            <ui:Label text="London is the capital city of England" name="LondonContent" />
+            <ui:Label text="Paris is the capital of France" name="ParisContent" class="unselectedContent" />
+            <ui:Label text="Ottawa is the capital of Canada" name="OttawaContent" class="unselectedContent" />
+        </ui:VisualElement>
     </ui:VisualElement>
 </ui:UXML>
diff --git a/relative-and-absolute-position/PositioningTest.uss b/relative-and-absolute-position/PositioningTest.uss
new file mode 100644
index 0000000..00fb961
--- /dev/null
+++ b/relative-and-absolute-position/PositioningTest.uss
@@ -0,0 +1,24 @@
+.vs {
+    height: 70px;
+    width: 70px;
+    margin-bottom: 2px;
+    background-color: gray;
+}
+
+#relative{
+    width: 70px; 
+    height: 70px; 
+    background-color: purple; 
+    left: 25px; 
+    margin-bottom: 2px;
+    position:relative;
+}
+
+#absolutePositionElement{
+    left: 25px; 
+    top: 25px; 
+    width: 70px; 
+    height: 70px; 
+    background-color: black;
+    position: absolute;
+}
diff --git a/relative-and-absolute-position/PositioningTest.uxml b/relative-and-absolute-position/PositioningTest.uxml
new file mode 100644
index 0000000..82f9304
--- /dev/null
+++ b/relative-and-absolute-position/PositioningTest.uxml
@@ -0,0 +1,11 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
+    <Style src="PositioningTest.uss" />
+    <ui:VisualElement>
+        <ui:VisualElement class="vs" />
+        <ui:VisualElement class="vs" />
+        <ui:Label text="Relative\nPos\n25, 0" name="relative" />
+        <ui:VisualElement class="vs" />
+        <ui:VisualElement class="vs" />
+        <ui:Label text="Absolute\nPos\n25, 25" name="absolutePositionElement" />
+    </ui:VisualElement>
+</ui:UXML>
diff --git a/relative-and-absolute-position/PostioningTestRuntime.cs b/relative-and-absolute-position/PostioningTestRuntime.cs
new file mode 100644
index 0000000..09e203c
--- /dev/null
+++ b/relative-and-absolute-position/PostioningTestRuntime.cs
@@ -0,0 +1,14 @@
+using UnityEngine;
+using UnityEngine.UIElements;
+
+public class PostioningTestRuntime : MonoBehaviour
+{
+    void OnEnable()
+    {
+        GetComponent<UIDocument>();
+
+    }   
+}
+
+        
+

From 2c4b48c4bdd16c6de7a338fa77d6b8acee831490 Mon Sep 17 00:00:00 2001
From: Lisha Li <lisha.li@unity3d.com>
Date: Thu, 9 Feb 2023 14:32:32 -0500
Subject: [PATCH 14/53] Fixed C# code error according to a user feedback.

---
 .../RadialProgressComponent.cs                   | 16 +++++++++++-----
 radial-progress/RadialProgressComponent.cs       | 16 +++++++++++-----
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/radial-progress-vector-api/RadialProgressComponent.cs b/radial-progress-vector-api/RadialProgressComponent.cs
index c863e15..65d4c51 100644
--- a/radial-progress-vector-api/RadialProgressComponent.cs
+++ b/radial-progress-vector-api/RadialProgressComponent.cs
@@ -10,16 +10,22 @@ public class RadialProgressComponent : MonoBehaviour
 
     RadialProgress m_RadialProgress;
 
-    void start()
+    void Start()
     {
         var root = GetComponent<UIDocument>().rootVisualElement;
-        // Find the custom control by name.
-        m_RadialProgress = root.Q("radial-progress") as RadialProgress;
+
+       m_RadialProgress = new RadialProgress() {
+            style = {
+                position = Position.Absolute,
+                left = 20, top = 20, width = 200, height = 200
+            }
+        };
+
+        root.Add(m_RadialProgress);
     }
 
     void Update()
     {
-        // For demo purpose, give the progress property dynamic values.
         m_RadialProgress.progress = ((Mathf.Sin(Time.time) + 1.0f) / 2.0f) * 60.0f + 10.0f;
     }
-}
\ No newline at end of file
+}
diff --git a/radial-progress/RadialProgressComponent.cs b/radial-progress/RadialProgressComponent.cs
index c863e15..65d4c51 100644
--- a/radial-progress/RadialProgressComponent.cs
+++ b/radial-progress/RadialProgressComponent.cs
@@ -10,16 +10,22 @@ public class RadialProgressComponent : MonoBehaviour
 
     RadialProgress m_RadialProgress;
 
-    void start()
+    void Start()
     {
         var root = GetComponent<UIDocument>().rootVisualElement;
-        // Find the custom control by name.
-        m_RadialProgress = root.Q("radial-progress") as RadialProgress;
+
+       m_RadialProgress = new RadialProgress() {
+            style = {
+                position = Position.Absolute,
+                left = 20, top = 20, width = 200, height = 200
+            }
+        };
+
+        root.Add(m_RadialProgress);
     }
 
     void Update()
     {
-        // For demo purpose, give the progress property dynamic values.
         m_RadialProgress.progress = ((Mathf.Sin(Time.time) + 1.0f) / 2.0f) * 60.0f + 10.0f;
     }
-}
\ No newline at end of file
+}

From 2ecb93e78285ab199fbf6a9a8f8ef1c49028b289 Mon Sep 17 00:00:00 2001
From: lilisha-unity <94024889+lilisha-unity@users.noreply.github.com>
Date: Sat, 25 Feb 2023 21:08:44 -0800
Subject: [PATCH 15/53] Update MainView.uss

---
 create-listview-runtime-ui/UI/MainView.uss | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/create-listview-runtime-ui/UI/MainView.uss b/create-listview-runtime-ui/UI/MainView.uss
index 6565f1c..33f16ef 100644
--- a/create-listview-runtime-ui/UI/MainView.uss
+++ b/create-listview-runtime-ui/UI/MainView.uss
@@ -31,13 +31,6 @@
     padding-bottom: 0;
 }
 
-#select-char-button {
-    width: 150px;
-    border-color: rgb(49, 26, 17);
-    background-color: rgb(255, 133, 84);
-    border-width: 2px;
-}
-
 #right-container{
     justify-content: space-between; 
     align-items: flex-end;
@@ -68,4 +61,4 @@
 #character-portrait{
     flex-grow: 1; 
     -unity-background-scale-mode: scale-to-fit;
-}
\ No newline at end of file
+}

From 215b134e8c8f736e7de90a13bceb891a154ac790 Mon Sep 17 00:00:00 2001
From: Lisha Li <lisha.li@unity3d.com>
Date: Tue, 5 Sep 2023 12:33:13 -0700
Subject: [PATCH 16/53] Updated code examples for drag and drop UI

---
 .../DragAndDropWindow.cs                                  | 8 +++++---
 .../DragAndDropWindow.uxml                                | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/create-a-drag-and-drop-window-inside-a-custom-editor-window/DragAndDropWindow.cs b/create-a-drag-and-drop-window-inside-a-custom-editor-window/DragAndDropWindow.cs
index 80a124d..594da88 100644
--- a/create-a-drag-and-drop-window-inside-a-custom-editor-window/DragAndDropWindow.cs
+++ b/create-a-drag-and-drop-window-inside-a-custom-editor-window/DragAndDropWindow.cs
@@ -3,7 +3,6 @@
 using UnityEngine.UIElements;
 using UnityEditor.UIElements;
 
-
 public class DragAndDropWindow : EditorWindow
 {
     [MenuItem("Window/UI Toolkit/Drag And Drop")]
@@ -19,13 +18,16 @@ public void CreateGUI()
         VisualElement root = rootVisualElement;
 
           // Import UXML
-        var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>("Assets/Drag and Drop/DragAndDropWindow.uxml");
+        var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>("Assets/Editor/DragAndDropWindow.uxml");
         VisualElement labelFromUXML = visualTree.Instantiate();
         root.Add(labelFromUXML);
 
         // A stylesheet can be added to a VisualElement.
         // The style will be applied to the VisualElement and all of its children.
-        var styleSheet = AssetDatabase.LoadAssetAtPath<StyleSheet>("Assets/Drag and Drop/DragAndDropWindow.uss");
+        var styleSheet = AssetDatabase.LoadAssetAtPath<StyleSheet>("Assets/Editor/DragAndDropWindow.uss");
+
+        DragAndDropManipulator manipulator =
+        new(rootVisualElement.Q<VisualElement>("object"));
     
     }
 }
\ No newline at end of file
diff --git a/create-a-drag-and-drop-window-inside-a-custom-editor-window/DragAndDropWindow.uxml b/create-a-drag-and-drop-window-inside-a-custom-editor-window/DragAndDropWindow.uxml
index 83a6d4a..be70227 100644
--- a/create-a-drag-and-drop-window-inside-a-custom-editor-window/DragAndDropWindow.uxml
+++ b/create-a-drag-and-drop-window-inside-a-custom-editor-window/DragAndDropWindow.uxml
@@ -1,5 +1,5 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
-    <Style src="project://database/Assets/Drag%20and%20Drop/DragAndDropWindow.uss?fileID=7433441132597879392&amp;guid=88e18c4dc407045fca44b634c99898a1&amp;type=3#DragAndDropWindow" />
+    <Style src="DragAndDropWindow.uss" />
     <ui:VisualElement name="slots">
         <ui:VisualElement name="slot_row1" class="slot_row">
             <ui:VisualElement name="slot1" class="slot" />
@@ -11,4 +11,4 @@
         </ui:VisualElement>
     </ui:VisualElement>
     <ui:VisualElement name="object" class="object" />
-</ui:UXML>
+</ui:UXML>
\ No newline at end of file

From 72b3893db5a00d051e22c9349ba7abdfbbf592ae Mon Sep 17 00:00:00 2001
From: lilisha-unity <lisha.li@unity3d.com>
Date: Tue, 5 Mar 2024 17:35:54 +0000
Subject: [PATCH 17/53] Added code example for
 create-a-custom-editor-window-with-CSharp

---
 .../MyCustomEditor.cs                         | 81 +++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100644 create-a-custom-editor-window-with-CSharp/MyCustomEditor.cs

diff --git a/create-a-custom-editor-window-with-CSharp/MyCustomEditor.cs b/create-a-custom-editor-window-with-CSharp/MyCustomEditor.cs
new file mode 100644
index 0000000..92d6cc0
--- /dev/null
+++ b/create-a-custom-editor-window-with-CSharp/MyCustomEditor.cs
@@ -0,0 +1,81 @@
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+public class MyCustomEditor : EditorWindow
+{
+    [SerializeField] private int m_SelectedIndex = -1;
+    private VisualElement m_RightPane;
+
+    [MenuItem("Window/UI Toolkit/MyCustomEditor")]
+    public static void ShowMyEditor()
+    {
+        // This method is called when the user selects the menu item in the Editor.
+        EditorWindow wnd = GetWindow<MyCustomEditor>();
+        wnd.titleContent = new GUIContent("My Custom Editor");
+
+        // Limit size of the window.
+        wnd.minSize = new Vector2(450, 200);
+        wnd.maxSize = new Vector2(1920, 720);
+  }
+
+  public void CreateGUI()
+  {
+      // Get a list of all sprites in the project.
+      var allObjectGuids = AssetDatabase.FindAssets("t:Sprite");
+      var allObjects = new List<Sprite>();
+      foreach (var guid in allObjectGuids)
+      {
+        allObjects.Add(AssetDatabase.LoadAssetAtPath<Sprite>(AssetDatabase.GUIDToAssetPath(guid)));
+      }
+
+      // Create a two-pane view with the left pane being fixed.
+      var splitView = new TwoPaneSplitView(0, 250, TwoPaneSplitViewOrientation.Horizontal);
+
+      // Add the panel to the visual tree by adding it as a child to the root element.
+      rootVisualElement.Add(splitView);
+
+      // A TwoPaneSplitView always needs two child elements.
+      var leftPane = new ListView();
+      splitView.Add(leftPane);
+      m_RightPane = new ScrollView(ScrollViewMode.VerticalAndHorizontal);
+      splitView.Add(m_RightPane);
+
+      // Initialize the list view with all sprites' names.
+      leftPane.makeItem = () => new Label();
+      leftPane.bindItem = (item, index) => { (item as Label).text = allObjects[index].name; };
+      leftPane.itemsSource = allObjects;
+
+      // React to the user's selection.
+      leftPane.selectionChanged += OnSpriteSelectionChange;
+
+      // Restore the selection index from before the hot reload.
+      leftPane.selectedIndex = m_SelectedIndex;
+
+      // Store the selection index when the selection changes.
+      leftPane.selectionChanged += (items) => { m_SelectedIndex = leftPane.selectedIndex; };
+  }
+
+  private void OnSpriteSelectionChange(IEnumerable<object> selectedItems)
+  {
+      // Clear all previous content from the pane.
+      m_RightPane.Clear();
+
+      var enumerator = selectedItems.GetEnumerator();
+      if (enumerator.MoveNext())
+      {
+          var selectedSprite = enumerator.Current as Sprite;
+          if (selectedSprite != null)
+          {
+              // Add a new Image control and display the sprite.
+              var spriteImage = new Image();
+              spriteImage.scaleMode = ScaleMode.ScaleToFit;
+              spriteImage.sprite = selectedSprite;
+
+              // Add the Image control to the right-hand pane.
+              m_RightPane.Add(spriteImage);
+          }
+      }
+  }
+}
\ No newline at end of file

From 9a36c0e9a6ee8815ed6d3a72229934348721e611 Mon Sep 17 00:00:00 2001
From: lilisha-unity <lisha.li@unity3d.com>
Date: Mon, 18 Mar 2024 19:48:12 +0000
Subject: [PATCH 18/53] Added create a custom Inspector code example

---
 create-a-custom-inspector/Car.cs              | 11 ++++++++
 .../Car_Inspector_UXML.uxml                   |  8 ++++++
 .../Editor/Car_Inspector.cs                   | 27 +++++++++++++++++++
 .../Editor/Tire_PropertyDrawer.cs             | 23 ++++++++++++++++
 create-a-custom-inspector/Tire.cs             | 11 ++++++++
 5 files changed, 80 insertions(+)
 create mode 100644 create-a-custom-inspector/Car.cs
 create mode 100644 create-a-custom-inspector/Car_Inspector_UXML.uxml
 create mode 100644 create-a-custom-inspector/Editor/Car_Inspector.cs
 create mode 100644 create-a-custom-inspector/Editor/Tire_PropertyDrawer.cs
 create mode 100644 create-a-custom-inspector/Tire.cs

diff --git a/create-a-custom-inspector/Car.cs b/create-a-custom-inspector/Car.cs
new file mode 100644
index 0000000..974097d
--- /dev/null
+++ b/create-a-custom-inspector/Car.cs
@@ -0,0 +1,11 @@
+using UnityEngine;
+
+public class Car : MonoBehaviour
+{
+    public string m_Make = "Toyota";
+    public int m_YearBuilt = 1980;
+    public Color m_Color = Color.black;
+
+    // This car has four tires.
+    public Tire[] m_Tires = new Tire[4];
+}
\ No newline at end of file
diff --git a/create-a-custom-inspector/Car_Inspector_UXML.uxml b/create-a-custom-inspector/Car_Inspector_UXML.uxml
new file mode 100644
index 0000000..4251d73
--- /dev/null
+++ b/create-a-custom-inspector/Car_Inspector_UXML.uxml
@@ -0,0 +1,8 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="True">
+    <ui:TextField picking-mode="Ignore" label="Make of the car" value="filler text" binding-path="m_Make" class="unity-base-field__aligned" />
+    <uie:PropertyField binding-path="m_YearBuilt" label="Year Built" class="unity-base-field__aligned" />
+    <uie:PropertyField binding-path="m_Color" label="Paint Color" class="unity-base-field__aligned" />
+    <uie:PropertyField label="Tire" binding-path="m_Tires" class="unity-base-field__aligned" />
+    <ui:Foldout text="Default Inspector" value="false" name="Default_Inspector" />
+</ui:UXML>
+
diff --git a/create-a-custom-inspector/Editor/Car_Inspector.cs b/create-a-custom-inspector/Editor/Car_Inspector.cs
new file mode 100644
index 0000000..0d1b583
--- /dev/null
+++ b/create-a-custom-inspector/Editor/Car_Inspector.cs
@@ -0,0 +1,27 @@
+using UnityEditor;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+
+[CustomEditor(typeof(Car))]
+public class Car_Inspector : Editor
+{
+    public VisualTreeAsset m_InspectorXML;
+    public override VisualElement CreateInspectorGUI()
+    {
+        // Create a new VisualElement to be the root of the Inspector UI.
+        VisualElement myInspector = new VisualElement();
+
+        // Load from default reference.
+        m_InspectorXML.CloneTree(myInspector);
+
+        // Get a reference to the default Inspector Foldout control.
+        VisualElement InspectorFoldout = myInspector.Q("Default_Inspector");
+
+        // Attach a default Inspector to the Foldout.
+        InspectorElement.FillDefaultInspector(InspectorFoldout, serializedObject, this);
+
+        // Return the finished Inspector UI.
+        return myInspector;
+    }
+}
+
diff --git a/create-a-custom-inspector/Editor/Tire_PropertyDrawer.cs b/create-a-custom-inspector/Editor/Tire_PropertyDrawer.cs
new file mode 100644
index 0000000..91f0f98
--- /dev/null
+++ b/create-a-custom-inspector/Editor/Tire_PropertyDrawer.cs
@@ -0,0 +1,23 @@
+using UnityEditor;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+
+[CustomPropertyDrawer(typeof(Tire))]
+public class Tire_PropertyDrawer : PropertyDrawer
+{
+    public override VisualElement CreatePropertyGUI(SerializedProperty property)
+    {
+        // Create a new VisualElement to be the root the property UI.
+        var container = new VisualElement();
+
+        // Create drawer UI using C#.
+        var popup = new UnityEngine.UIElements.PopupWindow();
+        popup.text = "Tire Details";
+        popup.Add(new PropertyField(property.FindPropertyRelative("m_AirPressure"), "Air Pressure (psi)"));
+        popup.Add(new PropertyField(property.FindPropertyRelative("m_ProfileDepth"), "Profile Depth (mm)"));
+        container.Add(popup);
+
+        // Return the finished UI.
+        return container;
+    }
+}
diff --git a/create-a-custom-inspector/Tire.cs b/create-a-custom-inspector/Tire.cs
new file mode 100644
index 0000000..37dbd93
--- /dev/null
+++ b/create-a-custom-inspector/Tire.cs
@@ -0,0 +1,11 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+[System.Serializable]
+public class Tire
+{
+    public float m_AirPressure = 21.5f;
+    public int m_ProfileDepth = 4;
+}
+

From 8f6348f5697c26e73a4e5363f1d64ef83c7e5636 Mon Sep 17 00:00:00 2001
From: lilisha-unity <lisha.li@unity3d.com>
Date: Mon, 18 Mar 2024 19:49:28 +0000
Subject: [PATCH 19/53] Updated Readme

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 40f490f..0e2f7d7 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,7 @@ You must follow the steps in the UI Toolkit user manual to create the examples.
 
 - [Get started with UI Toolkit](https://docs.unity3d.com/Documentation/Manual/UIE-simple-ui-toolkit-workflow.html)
 - [Relative and absolute positioning C# example](https://docs.unity3d.com/Manual/UIE-relative-absolute-positioning-example.html)
+- [Create a Custom Inspector ](https://docs.unity3d.com/Documentation/Manual/UIE-HowTo-CreateCustomInspector.html)
 
 ## Runtime UI examples
 

From 2fd2a3734a81c30467fa630d3000b00f232f2a23 Mon Sep 17 00:00:00 2001
From: Lisha Li <lisha.li@unity3d.com>
Date: Mon, 1 Apr 2024 11:53:23 -0700
Subject: [PATCH 20/53] Updated code example for rumtime ListView

---
 create-listview-runtime-ui/UI/MainView.uss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/create-listview-runtime-ui/UI/MainView.uss b/create-listview-runtime-ui/UI/MainView.uss
index 33f16ef..992d548 100644
--- a/create-listview-runtime-ui/UI/MainView.uss
+++ b/create-listview-runtime-ui/UI/MainView.uss
@@ -62,3 +62,7 @@
     flex-grow: 1; 
     -unity-background-scale-mode: scale-to-fit;
 }
+
+.unity-collection-view__item {
+    justify-content: center;
+}
\ No newline at end of file

From 68fad6f7b943749551da99e5e5c53242ecd74e3c Mon Sep 17 00:00:00 2001
From: lilisha-unity <lisha.li@unity3d.com>
Date: Tue, 9 Apr 2024 20:09:16 +0000
Subject: [PATCH 21/53] Updated example code for changes made for 2022.3+

---
 .../Scripts/CharacterData.cs                  | 24 +++++++++----------
 .../Scripts/CharacterListController.cs        | 17 ++++++-------
 .../Scripts/CharacterListEntryController.cs   | 16 ++++++-------
 create-listview-runtime-ui/UI/MainView.uss    | 12 +++++-----
 4 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/create-listview-runtime-ui/Scripts/CharacterData.cs b/create-listview-runtime-ui/Scripts/CharacterData.cs
index ea51560..dde3829 100644
--- a/create-listview-runtime-ui/Scripts/CharacterData.cs
+++ b/create-listview-runtime-ui/Scripts/CharacterData.cs
@@ -1,14 +1,14 @@
-    using UnityEngine;
+using UnityEngine;
 
-    public enum ECharacterClass
-    {
-        Knight, Ranger, Wizard
-    }
+public enum ECharacterClass
+{
+    Knight, Ranger, Wizard
+}
 
-    [CreateAssetMenu]
-    public class CharacterData : ScriptableObject
-    {
-        public string m_CharacterName;
-        public ECharacterClass m_Class;
-        public Sprite m_PortraitImage;
-    }
\ No newline at end of file
+[CreateAssetMenu]
+public class CharacterData : ScriptableObject
+{
+    public string CharacterName;
+    public ECharacterClass Class;
+    public Sprite PortraitImage;
+}
\ No newline at end of file
diff --git a/create-listview-runtime-ui/Scripts/CharacterListController.cs b/create-listview-runtime-ui/Scripts/CharacterListController.cs
index 4f26728..fd1723c 100644
--- a/create-listview-runtime-ui/Scripts/CharacterListController.cs
+++ b/create-listview-runtime-ui/Scripts/CharacterListController.cs
@@ -13,6 +13,8 @@ public class CharacterListController
     Label m_CharNameLabel;
     VisualElement m_CharPortrait;
 
+    List<CharacterData> m_AllCharacters;
+
     public void InitializeCharacterList(VisualElement root, VisualTreeAsset listElementTemplate)
     {
         EnumerateAllCharacters();
@@ -31,11 +33,9 @@ public void InitializeCharacterList(VisualElement root, VisualTreeAsset listElem
         FillCharacterList();
 
         // Register to get a callback when an item is selected
-        m_CharacterList.onSelectionChange += OnCharacterSelected;
+        m_CharacterList.selectionChanged += OnCharacterSelected;
     }
 
-    List<CharacterData> m_AllCharacters;
-
     void EnumerateAllCharacters()
     {
         m_AllCharacters = new List<CharacterData>();
@@ -66,10 +66,11 @@ void FillCharacterList()
         // Set up bind function for a specific list entry
         m_CharacterList.bindItem = (item, index) =>
         {
-            (item.userData as CharacterListEntryController).SetCharacterData(m_AllCharacters[index]);
+            (item.userData as CharacterListEntryController)?.SetCharacterData(m_AllCharacters[index]);
         };
 
-        // Set a fixed item height
+        // Set a fixed item height matching the height of the item provided in makeItem. 
+        // For dynamic height, see the virtualizationMethod property.
         m_CharacterList.fixedItemHeight = 45;
 
         // Set the actual item's source list/array
@@ -93,8 +94,8 @@ void OnCharacterSelected(IEnumerable<object> selectedItems)
         }
 
         // Fill in character details
-        m_CharClassLabel.text = selectedCharacter.m_Class.ToString();
-        m_CharNameLabel.text = selectedCharacter.m_CharacterName;
-        m_CharPortrait.style.backgroundImage = new StyleBackground(selectedCharacter.m_PortraitImage);
+        m_CharClassLabel.text = selectedCharacter.Class.ToString();
+        m_CharNameLabel.text = selectedCharacter.CharacterName;
+        m_CharPortrait.style.backgroundImage = new StyleBackground(selectedCharacter.PortraitImage);
     }
 }
\ No newline at end of file
diff --git a/create-listview-runtime-ui/Scripts/CharacterListEntryController.cs b/create-listview-runtime-ui/Scripts/CharacterListEntryController.cs
index 26c4816..e590610 100644
--- a/create-listview-runtime-ui/Scripts/CharacterListEntryController.cs
+++ b/create-listview-runtime-ui/Scripts/CharacterListEntryController.cs
@@ -4,21 +4,19 @@ public class CharacterListEntryController
 {
     Label m_NameLabel;
 
-    //This function retrieves a reference to the 
-    //character name label inside the UI element.
-
+    // This function retrieves a reference to the 
+    // character name label inside the UI element.
     public void SetVisualElement(VisualElement visualElement)
     {
         m_NameLabel = visualElement.Q<Label>("character-name");
     }
 
-    //This function receives the character whose name this list 
-    //element is supposed to display. Since the elements list 
-    //in a `ListView` are pooled and reused, it's necessary to 
-    //have a `Set` function to change which character's data to display.
-
+    // This function receives the character whose name this list 
+    // element is supposed to display. Since the elements list 
+    // in a `ListView` are pooled and reused, it's necessary to 
+    // have a `Set` function to change which character's data to display.
     public void SetCharacterData(CharacterData characterData)
     {
-        m_NameLabel.text = characterData.m_CharacterName;
+        m_NameLabel.text = characterData.CharacterName;
     }
 }
\ No newline at end of file
diff --git a/create-listview-runtime-ui/UI/MainView.uss b/create-listview-runtime-ui/UI/MainView.uss
index 992d548..76d8733 100644
--- a/create-listview-runtime-ui/UI/MainView.uss
+++ b/create-listview-runtime-ui/UI/MainView.uss
@@ -24,19 +24,19 @@
     font-size: 18px;
 }
 
-#CharacterClass {
+#character-class {
     margin-top: 2px;
     margin-bottom: 8px;
     padding-top: 0;
     padding-bottom: 0;
 }
 
-#right-container{
+#right-container {
     justify-content: space-between; 
     align-items: flex-end;
 }
 
-#details-container{
+#details-container {
     align-items: center; 
     background-color: rgb(170, 89, 57); 
     border-width: 4px; 
@@ -48,7 +48,7 @@
     height: 163px;
 }
 
-#details{
+#details {
     border-color: rgb(49, 26, 17); 
     border-width: 2px; 
     height: 120px; 
@@ -58,11 +58,11 @@
     background-color: rgb(255, 133, 84);
 }
 
-#character-portrait{
+#character-portrait {
     flex-grow: 1; 
     -unity-background-scale-mode: scale-to-fit;
 }
 
 .unity-collection-view__item {
     justify-content: center;
-}
\ No newline at end of file
+}

From 2af533ba7c041b0f5f52aaa6e6561ab7e62179e3 Mon Sep 17 00:00:00 2001
From: lilisha-unity <lisha.li@unity3d.com>
Date: Wed, 14 Aug 2024 22:04:20 +0000
Subject: [PATCH 22/53] Updated code example for Get started with UITK doc

---
 .../MyCustomEditor_UXML.uxml                  | 11 ----------
 ...yCustomEditor.cs => SimpleCustomEditor.cs} | 21 ++++++++++---------
 ...tomEditor.uxml => SimpleCustomEditor.uxml} |  6 +++---
 .../SimpleCustomEditor_uxml.uxml              |  5 +++++
 4 files changed, 19 insertions(+), 24 deletions(-)
 delete mode 100644 simple-ui-toolkit-workflow/MyCustomEditor_UXML.uxml
 rename simple-ui-toolkit-workflow/{MyCustomEditor.cs => SimpleCustomEditor.cs} (80%)
 rename simple-ui-toolkit-workflow/{MyCustomEditor.uxml => SimpleCustomEditor.uxml} (59%)
 create mode 100644 simple-ui-toolkit-workflow/SimpleCustomEditor_uxml.uxml

diff --git a/simple-ui-toolkit-workflow/MyCustomEditor_UXML.uxml b/simple-ui-toolkit-workflow/MyCustomEditor_UXML.uxml
deleted file mode 100644
index 6f73da8..0000000
--- a/simple-ui-toolkit-workflow/MyCustomEditor_UXML.uxml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<engine:UXML
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:engine="UnityEngine.UIElements"
-    xmlns:editor="UnityEditor.UIElements"
-    xsi:noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd"
->
-    <engine:Label text="These controls were created with UXML." />
-    <engine:Button text="This is button2." name="button2"/>
-    <engine:Toggle label="Number?" name="toggle2"/>
-</engine:UXML>
\ No newline at end of file
diff --git a/simple-ui-toolkit-workflow/MyCustomEditor.cs b/simple-ui-toolkit-workflow/SimpleCustomEditor.cs
similarity index 80%
rename from simple-ui-toolkit-workflow/MyCustomEditor.cs
rename to simple-ui-toolkit-workflow/SimpleCustomEditor.cs
index 6d4d653..f26fe71 100644
--- a/simple-ui-toolkit-workflow/MyCustomEditor.cs
+++ b/simple-ui-toolkit-workflow/SimpleCustomEditor.cs
@@ -2,17 +2,17 @@
 using UnityEngine;
 using UnityEngine.UIElements;
 
-public class MyCustomEditor : EditorWindow
+public class SimpleCustomEditor : EditorWindow
 {
     [MenuItem("Window/UI Toolkit/MyCustomEditor")]
     public static void ShowExample()
     {
-        MyCustomEditor wnd = GetWindow<MyCustomEditor>();
+        SimpleCustomEditor wnd = GetWindow<SimpleCustomEditor>();
         wnd.titleContent = new GUIContent("MyCustomEditor");
     }
 
     [SerializeField]
-    private VisualTreeAsset m_UXMLTree;
+    private VisualTreeAsset m_UXMLTree = default;
 
     private int m_ClickCount = 0;
 
@@ -23,7 +23,7 @@ public void CreateGUI()
         // Each editor window contains a root VisualElement object
         VisualElement root = rootVisualElement;
 
-        // VisualElements objects can contain other VisualElements following a tree hierarchy.
+        // VisualElements objects can contain other VisualElement following a tree hierarchy.
         Label label = new Label("These controls were created using C# code.");
         root.Add(label);
 
@@ -37,18 +37,19 @@ public void CreateGUI()
         toggle.label = "Number?";
         root.Add(toggle);
 
-        // Import UXML
-        var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>("Assets/Editor/MyCustomEditor.uxml");
-        VisualElement labelFromUXML = visualTree.Instantiate();
-        root.Add(labelFromUXML);
-
+        // Instantiate UXML created automatically which is set as the default VisualTreeAsset.
         root.Add(m_UXMLTree.Instantiate());
 
+        // Import UXML created manually.
+        var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>("Assets/Editor/SimpleCustomEditor_uxml.uxml");
+        VisualElement labelFromUXML_uxml = visualTree.Instantiate();
+        root.Add(labelFromUXML_uxml);
+
         //Call the event handler
         SetupButtonHandler();
     }
 
-    //Functions as the event handlers for your button click and number counts 
+    //Functions as the event handlers for your button click and number counts
     private void SetupButtonHandler()
     {
         VisualElement root = rootVisualElement;
diff --git a/simple-ui-toolkit-workflow/MyCustomEditor.uxml b/simple-ui-toolkit-workflow/SimpleCustomEditor.uxml
similarity index 59%
rename from simple-ui-toolkit-workflow/MyCustomEditor.uxml
rename to simple-ui-toolkit-workflow/SimpleCustomEditor.uxml
index 8a12bfb..bf6136c 100644
--- a/simple-ui-toolkit-workflow/MyCustomEditor.uxml
+++ b/simple-ui-toolkit-workflow/SimpleCustomEditor.uxml
@@ -1,5 +1,5 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
-    <ui:Label text="These controls were created in UI Builder" />
-    <ui:Button text="This is button1" display-tooltip-when-elided="true" name="button1" />
-    <ui:Toggle label="Number?" name="toggle1" />
+    <ui:Label text="These controls were created in UI Builder." />
+    <ui:Button text="This is button1" name="button1"/>
+    <ui:Toggle label="Number?" name="toggle1"/>
 </ui:UXML>
diff --git a/simple-ui-toolkit-workflow/SimpleCustomEditor_uxml.uxml b/simple-ui-toolkit-workflow/SimpleCustomEditor_uxml.uxml
new file mode 100644
index 0000000..043ad35
--- /dev/null
+++ b/simple-ui-toolkit-workflow/SimpleCustomEditor_uxml.uxml
@@ -0,0 +1,5 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
+    <ui:Label text="These controls were created with UXML." />
+    <ui:Button text="This is button2" name="button2"/>
+    <ui:Toggle label="Number?" name="toggle2"/>
+</ui:UXML>

From 1f1340f4de89f8ab404910e23d23261cafb897cc Mon Sep 17 00:00:00 2001
From: lisha-li <lisha.li@unity3d.com>
Date: Thu, 29 Aug 2024 12:59:22 -0700
Subject: [PATCH 23/53] Updated uxml variable name

---
 create-listviews-treeviews/PlanetsListView.cs            | 2 +-
 create-listviews-treeviews/PlanetsMultiColumnListView.cs | 2 +-
 create-listviews-treeviews/PlanetsMultiColumnTreeView.cs | 2 +-
 create-listviews-treeviews/PlanetsTreeView.cs            | 2 +-
 create-listviews-treeviews/PlanetsWindow.cs              | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/create-listviews-treeviews/PlanetsListView.cs b/create-listviews-treeviews/PlanetsListView.cs
index 5fee122..c38f1c3 100644
--- a/create-listviews-treeviews/PlanetsListView.cs
+++ b/create-listviews-treeviews/PlanetsListView.cs
@@ -11,7 +11,7 @@ static void Summon()
 
     void CreateGUI()
     {
-        uxml.CloneTree(rootVisualElement);
+        uxmlAsset.CloneTree(rootVisualElement);
         var listView = rootVisualElement.Q<ListView>();
 
         // Set ListView.itemsSource to populate the data in the list.
diff --git a/create-listviews-treeviews/PlanetsMultiColumnListView.cs b/create-listviews-treeviews/PlanetsMultiColumnListView.cs
index 2cedaec..04fffbf 100644
--- a/create-listviews-treeviews/PlanetsMultiColumnListView.cs
+++ b/create-listviews-treeviews/PlanetsMultiColumnListView.cs
@@ -11,7 +11,7 @@ static void Summon()
 
     void CreateGUI()
     {
-        uxml.CloneTree(rootVisualElement);
+        uxmlAsset.CloneTree(rootVisualElement);
         var listView = rootVisualElement.Q<MultiColumnListView>();
 
         // Set MultiColumnListView.itemsSource to populate the data in the list.
diff --git a/create-listviews-treeviews/PlanetsMultiColumnTreeView.cs b/create-listviews-treeviews/PlanetsMultiColumnTreeView.cs
index 3bc4dc1..4b78e06 100644
--- a/create-listviews-treeviews/PlanetsMultiColumnTreeView.cs
+++ b/create-listviews-treeviews/PlanetsMultiColumnTreeView.cs
@@ -11,7 +11,7 @@ static void Summon()
 
     void CreateGUI()
     {
-        uxml.CloneTree(rootVisualElement);
+        uxmlAsset.CloneTree(rootVisualElement);
         var treeView = rootVisualElement.Q<MultiColumnTreeView>();
 
         // Call MultiColumnTreeView.SetRootItems() to populate the data in the tree.
diff --git a/create-listviews-treeviews/PlanetsTreeView.cs b/create-listviews-treeviews/PlanetsTreeView.cs
index 07b1253..1d976d1 100644
--- a/create-listviews-treeviews/PlanetsTreeView.cs
+++ b/create-listviews-treeviews/PlanetsTreeView.cs
@@ -11,7 +11,7 @@ static void Summon()
 
     void CreateGUI()
     {
-        uxml.CloneTree(rootVisualElement);
+        uxmlAsset.CloneTree(rootVisualElement);
         var treeView = rootVisualElement.Q<TreeView>();
 
         // Call TreeView.SetRootItems() to populate the data in the tree.
diff --git a/create-listviews-treeviews/PlanetsWindow.cs b/create-listviews-treeviews/PlanetsWindow.cs
index 6195737..efa5ef1 100644
--- a/create-listviews-treeviews/PlanetsWindow.cs
+++ b/create-listviews-treeviews/PlanetsWindow.cs
@@ -7,7 +7,7 @@
 public class PlanetsWindow : EditorWindow
 {
     [SerializeField]
-    protected VisualTreeAsset uxml;
+    protected VisualTreeAsset uxmlAsset;
 
     // Nested interface that may be either a single planet or a group of planets.
     protected interface IPlanetOrGroup

From 591561f40ba354ea3e611522fe99abcbd4f158bb Mon Sep 17 00:00:00 2001
From: lisha-li <lisha.li@unity3d.com>
Date: Wed, 30 Oct 2024 11:09:17 -0700
Subject: [PATCH 24/53] Added example files for creating custom swirl filter.

---
 .gitignore                                    |  2 +
 .../SwirlFilter/Swirl.mat                     | 34 +++++++++
 .../SwirlFilter/Swirl.shader                  | 70 +++++++++++++++++++
 .../SwirlFilter/SwirlfFilterFunction.asset    | 42 +++++++++++
 .../SwirlFilterExample.uss                    | 23 ++++++
 .../SwirlFilterExample.uxml                   |  6 ++
 6 files changed, 177 insertions(+)
 create mode 100644 create-a-custom-swirl-filter/SwirlFilter/Swirl.mat
 create mode 100644 create-a-custom-swirl-filter/SwirlFilter/Swirl.shader
 create mode 100644 create-a-custom-swirl-filter/SwirlFilter/SwirlfFilterFunction.asset
 create mode 100644 create-a-custom-swirl-filter/SwirlFilterExample.uss
 create mode 100644 create-a-custom-swirl-filter/SwirlFilterExample.uxml

diff --git a/.gitignore b/.gitignore
index 4aa5c03..9bc69fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@
 # Please do not add editor specific ignore lines to this file. Unity best practices
 # documentation regarding this can be found at
 # https://github.com/Applifier/unity-ads-documentation/wiki/Conventions#gitignore
+
+.DS_Store
\ No newline at end of file
diff --git a/create-a-custom-swirl-filter/SwirlFilter/Swirl.mat b/create-a-custom-swirl-filter/SwirlFilter/Swirl.mat
new file mode 100644
index 0000000..e60e81f
--- /dev/null
+++ b/create-a-custom-swirl-filter/SwirlFilter/Swirl.mat
@@ -0,0 +1,34 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Swirl
+  m_Shader: {fileID: 4800000, guid: 7225ea8bfa79e834d8b1352a50a58f2a, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats: []
+    m_Colors: []
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader b/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader
new file mode 100644
index 0000000..65e85a6
--- /dev/null
+++ b/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader
@@ -0,0 +1,70 @@
+Shader "Unlit/Swirl"
+{
+    Properties
+    {
+        _MainTex ("Texture", 2D) = "white" {}
+    }
+    SubShader
+    {
+        Tags { "RenderType"="Opaque" }
+        LOD 100
+
+        Pass
+        {
+            CGPROGRAM
+            #pragma vertex vert
+            #pragma fragment frag
+
+            #include "UnityCG.hlsl"
+
+            struct appdata
+            {
+                float4 vertex : POSITION;
+                float2 uv : TEXCOORD0;
+            };
+
+            struct v2f
+            {
+                float2 uv : TEXCOORD0;
+                float4 vertex : SV_POSITION;
+            };
+
+            Texture2D _MainTex;
+            float4 _MainTex_ST;
+            float4 _MainTex_TexelSize;
+
+            SamplerState my_linear_repeat_sampler;
+
+            float _Angle;
+            float _Radius;
+
+            v2f vert (appdata v)
+            {
+                v2f o;
+                o.vertex = UnityObjectToClipPos(v.vertex);
+                o.uv = TRANSFORM_TEX(v.uv, _MainTex);
+                return o;
+            }
+
+            fixed4 frag (v2f i) : SV_Target
+            {
+                float effectRadius = _Radius;
+                float effectAngle = _Angle;
+                
+                float2 center = float2(0.5, 0.5);
+                
+                float2 uv = i.uv - center;
+                
+                float len = length(uv * float2(_MainTex_TexelSize.z * _MainTex_TexelSize.y, 1.));
+                float angle = atan2(uv.y, uv.x) + effectAngle * smoothstep(effectRadius, 0., len);
+                float radius = length(uv);
+
+                uv = radius * float2(cos(angle), sin(angle)) + center;
+                fixed4 fragColor = _MainTex.Sample(my_linear_repeat_sampler, uv);
+                
+                return fragColor;
+            }
+            ENDCG
+        }
+    }
+}
diff --git a/create-a-custom-swirl-filter/SwirlFilter/SwirlfFilterFunction.asset b/create-a-custom-swirl-filter/SwirlFilter/SwirlfFilterFunction.asset
new file mode 100644
index 0000000..a247434
--- /dev/null
+++ b/create-a-custom-swirl-filter/SwirlFilter/SwirlfFilterFunction.asset
@@ -0,0 +1,42 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 19106, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: SwirlfFilterFunction
+  m_EditorClassIdentifier: 
+  m_FilterName: swirl
+  m_Parameters:
+  - m_InterpolationDefaultValue:
+      m_Type: 0
+      m_FloatValue: 0
+      m_ColorValue: {r: 0, g: 0, b: 0, a: 0}
+  - m_InterpolationDefaultValue:
+      m_Type: 0
+      m_FloatValue: 0
+      m_ColorValue: {r: 0, g: 0, b: 0, a: 0}
+  m_Passes:
+  - m_Material: {fileID: 2100000, guid: 9849d10efcac8074da47726363a7baca, type: 2}
+    m_PassIndex: 0
+    m_ParameterBindings:
+    - m_Index: 0
+      m_Name: _Angle
+    - m_Index: 1
+      m_Name: _Radius
+    m_ReadMargins:
+      m_Left: 0
+      m_Top: 0
+      m_Right: 0
+      m_Bottom: 0
+    m_WriteMargins:
+      m_Left: 0
+      m_Top: 0
+      m_Right: 0
+      m_Bottom: 0
diff --git a/create-a-custom-swirl-filter/SwirlFilterExample.uss b/create-a-custom-swirl-filter/SwirlFilterExample.uss
new file mode 100644
index 0000000..2920536
--- /dev/null
+++ b/create-a-custom-swirl-filter/SwirlFilterExample.uss
@@ -0,0 +1,23 @@
+.outside {
+    flex-grow: 1;
+    position: absolute;
+    height: 207px;
+    width: 234px;
+    top: 46px;
+    left: 27px;
+    background-color: rgb(255, 0, 0);
+}
+
+.inside {
+    flex-grow: 1;
+    position: absolute;
+    height: 75px;
+    width: 100px;
+    top: 46px;
+    left: 27px;
+    background-color: rgb(0, 255, 247);
+}
+
+.filterEffect {
+    filter: filter("SwirlFilter/SwirlfFilterFunction.asset" 58.9 2.3);
+}
diff --git a/create-a-custom-swirl-filter/SwirlFilterExample.uxml b/create-a-custom-swirl-filter/SwirlFilterExample.uxml
new file mode 100644
index 0000000..96bb06c
--- /dev/null
+++ b/create-a-custom-swirl-filter/SwirlFilterExample.uxml
@@ -0,0 +1,6 @@
+<engine:UXML xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:engine="UnityEngine.UIElements" xmlns:editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
+    <Style src="SwirlFilterExample.uss" />
+    <engine:VisualElement class="outside filterEffect">
+        <engine:VisualElement class="inside" />
+    </engine:VisualElement>
+</engine:UXML>

From 2927ad0fe6a276fc6ef68eb039d0174b7ed38c32 Mon Sep 17 00:00:00 2001
From: lisha-li <lisha.li@unity3d.com>
Date: Thu, 31 Oct 2024 10:39:42 -0700
Subject: [PATCH 25/53] Updated meterial file for swirl filter.

---
 .../SwirlFilter/Swirl.shader                  | 143 +++++++++---------
 1 file changed, 73 insertions(+), 70 deletions(-)

diff --git a/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader b/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader
index 65e85a6..be61fab 100644
--- a/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader
+++ b/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader
@@ -1,70 +1,73 @@
-Shader "Unlit/Swirl"
-{
-    Properties
-    {
-        _MainTex ("Texture", 2D) = "white" {}
-    }
-    SubShader
-    {
-        Tags { "RenderType"="Opaque" }
-        LOD 100
-
-        Pass
-        {
-            CGPROGRAM
-            #pragma vertex vert
-            #pragma fragment frag
-
-            #include "UnityCG.hlsl"
-
-            struct appdata
-            {
-                float4 vertex : POSITION;
-                float2 uv : TEXCOORD0;
-            };
-
-            struct v2f
-            {
-                float2 uv : TEXCOORD0;
-                float4 vertex : SV_POSITION;
-            };
-
-            Texture2D _MainTex;
-            float4 _MainTex_ST;
-            float4 _MainTex_TexelSize;
-
-            SamplerState my_linear_repeat_sampler;
-
-            float _Angle;
-            float _Radius;
-
-            v2f vert (appdata v)
-            {
-                v2f o;
-                o.vertex = UnityObjectToClipPos(v.vertex);
-                o.uv = TRANSFORM_TEX(v.uv, _MainTex);
-                return o;
-            }
-
-            fixed4 frag (v2f i) : SV_Target
-            {
-                float effectRadius = _Radius;
-                float effectAngle = _Angle;
-                
-                float2 center = float2(0.5, 0.5);
-                
-                float2 uv = i.uv - center;
-                
-                float len = length(uv * float2(_MainTex_TexelSize.z * _MainTex_TexelSize.y, 1.));
-                float angle = atan2(uv.y, uv.x) + effectAngle * smoothstep(effectRadius, 0., len);
-                float radius = length(uv);
-
-                uv = radius * float2(cos(angle), sin(angle)) + center;
-                fixed4 fragColor = _MainTex.Sample(my_linear_repeat_sampler, uv);
-                
-                return fragColor;
-            }
-            ENDCG
-        }
-    }
-}
+Shader "Unlit/Swirl"
+{
+    Properties
+    {
+        _MainTex ("Texture", 2D) = "white" {}
+    }
+    SubShader
+    {
+        Tags { "RenderType"="Opaque" }
+        Blend One OneMinusSrcAlpha
+        ZWrite Off
+        ZTest Always 
+        Cull Off
+
+        Pass
+        {
+            CGPROGRAM
+            #pragma vertex vert
+            #pragma fragment frag
+
+            #include "UnityCG.hlsl"
+
+            struct appdata
+            {
+                float4 vertex : POSITION;
+                float2 uv : TEXCOORD0;
+            };
+
+            struct v2f
+            {
+                float2 uv : TEXCOORD0;
+                float4 vertex : SV_POSITION;
+            };
+
+            Texture2D _MainTex;
+            float4 _MainTex_ST;
+            float4 _MainTex_TexelSize;
+
+            SamplerState my_linear_repeat_sampler;
+
+            float _Angle;
+            float _Radius;
+
+            v2f vert (appdata v)
+            {
+                v2f o;
+                o.vertex = UnityObjectToClipPos(v.vertex);
+                o.uv = TRANSFORM_TEX(v.uv, _MainTex);
+                return o;
+            }
+
+            fixed4 frag (v2f i) : SV_Target
+            {
+                float effectRadius = _Radius;
+                float effectAngle = _Angle;
+                
+                float2 center = float2(0.5, 0.5);
+                
+                float2 uv = i.uv - center;
+                
+                float len = length(uv * float2(_MainTex_TexelSize.z * _MainTex_TexelSize.y, 1.));
+                float angle = atan2(uv.y, uv.x) + effectAngle * smoothstep(effectRadius, 0., len);
+                float radius = length(uv);
+
+                uv = radius * float2(cos(angle), sin(angle)) + center;
+                fixed4 fragColor = _MainTex.Sample(my_linear_repeat_sampler, uv);
+                
+                return fragColor;
+            }
+            ENDCG
+        }
+    }
+}

From 98db06ed81f3527aa89d08175c38d4683a0803ee Mon Sep 17 00:00:00 2001
From: lisha-li <lisha.li@unity3d.com>
Date: Fri, 1 Nov 2024 13:22:07 -0700
Subject: [PATCH 26/53] Updated shader and mat file for swirl example.

---
 create-a-custom-swirl-filter/SwirlFilter/Swirl.mat    | 2 +-
 create-a-custom-swirl-filter/SwirlFilter/Swirl.shader | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/create-a-custom-swirl-filter/SwirlFilter/Swirl.mat b/create-a-custom-swirl-filter/SwirlFilter/Swirl.mat
index e60e81f..7cfa18e 100644
--- a/create-a-custom-swirl-filter/SwirlFilter/Swirl.mat
+++ b/create-a-custom-swirl-filter/SwirlFilter/Swirl.mat
@@ -8,7 +8,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Swirl
-  m_Shader: {fileID: 4800000, guid: 7225ea8bfa79e834d8b1352a50a58f2a, type: 3}
+  m_Shader: {fileID: 4800000, guid: 854a2ef897d5241a9aee8b5c37efdae1, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
diff --git a/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader b/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader
index be61fab..6bc8788 100644
--- a/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader
+++ b/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader
@@ -51,6 +51,7 @@ Shader "Unlit/Swirl"
 
             fixed4 frag (v2f i) : SV_Target
             {
+                // https://www.shadertoy.com/view/Xscyzn
                 float effectRadius = _Radius;
                 float effectAngle = _Angle;
                 

From 84c3c498e542f6170282a083950424ea983b1bdc Mon Sep 17 00:00:00 2001
From: lisha-li <lisha.li@unity3d.com>
Date: Fri, 1 Nov 2024 13:23:02 -0700
Subject: [PATCH 27/53] Updated shader file for swirl example.

---
 create-a-custom-swirl-filter/SwirlFilter/Swirl.shader | 1 -
 1 file changed, 1 deletion(-)

diff --git a/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader b/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader
index 6bc8788..be61fab 100644
--- a/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader
+++ b/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader
@@ -51,7 +51,6 @@ Shader "Unlit/Swirl"
 
             fixed4 frag (v2f i) : SV_Target
             {
-                // https://www.shadertoy.com/view/Xscyzn
                 float effectRadius = _Radius;
                 float effectAngle = _Angle;
                 

From 5c4c297fb2be91b64f5ddd911639fcb35d7c17f0 Mon Sep 17 00:00:00 2001
From: lilisha-unity <lisha.li@unity3d.com>
Date: Mon, 30 Dec 2024 17:56:17 +0000
Subject: [PATCH 28/53] Added sample code for moving elements at runtime.

---
 .../Scripts/MovingNameTag.cs                  | 79 +++++++++++++++++++
 .../Scripts/RandomMovement.cs                 | 38 +++++++++
 .../Scripts/SortElements.cs                   | 31 ++++++++
 .../UI/MovingElements.uxml                    |  3 +
 move-element-at-runtime/UI/NameTag.uxml       |  3 +
 5 files changed, 154 insertions(+)
 create mode 100644 move-element-at-runtime/Scripts/MovingNameTag.cs
 create mode 100644 move-element-at-runtime/Scripts/RandomMovement.cs
 create mode 100644 move-element-at-runtime/Scripts/SortElements.cs
 create mode 100644 move-element-at-runtime/UI/MovingElements.uxml
 create mode 100644 move-element-at-runtime/UI/NameTag.uxml

diff --git a/move-element-at-runtime/Scripts/MovingNameTag.cs b/move-element-at-runtime/Scripts/MovingNameTag.cs
new file mode 100644
index 0000000..1639503
--- /dev/null
+++ b/move-element-at-runtime/Scripts/MovingNameTag.cs
@@ -0,0 +1,79 @@
+using System;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+public class MovingNameTag : MonoBehaviour
+{
+    [SerializeField]
+    VisualTreeAsset m_NameTagTemplate;
+
+    [SerializeField]
+    UIDocument m_BaseContainerDocument;
+
+    [SerializeField]
+    Transform m_UITransform;
+
+    [SerializeField]
+    float m_ScaleMultiplier;
+
+    [SerializeField]
+    float m_DistanceCullingRange;
+
+    VisualElement m_Root;
+    VisualElement m_BaseContainer;
+    VisualElement m_NpcNameTag;
+    
+    Camera m_MainCamera;
+    
+    void Awake()
+    {
+        m_MainCamera = Camera.main;
+        
+        m_BaseContainer = m_BaseContainerDocument.rootVisualElement.Q<VisualElement>("BaseContainer");
+        
+        m_NpcNameTag = m_NameTagTemplate.Instantiate();
+        m_BaseContainer.Add(m_NpcNameTag);
+        m_NpcNameTag.style.position = new StyleEnum<Position>(Position.Absolute);
+    }
+
+    void Update()
+    {
+        SetNameTagPositionAndScale();
+    }
+
+    void SetNameTagPositionAndScale()
+    {
+        var cameraSpaceLocation = GetCameraSpaceLocation(m_UITransform);
+        
+        // Use style.translate to set the position of the name tag.
+        m_NpcNameTag.style.translate = new Translate(cameraSpaceLocation.x, cameraSpaceLocation.y);
+
+        // Get distance of NPC from camera.
+        var distance = Vector3.Distance(m_UITransform.position, m_MainCamera.transform.position);
+        
+        // Calculate 1/distance so the name tag get smaller as the distance gets bigger.
+        var scale = 1 / distance * m_ScaleMultiplier;
+
+        m_NpcNameTag.style.scale = new Scale(new Vector2(scale, scale));
+        
+        / /Display name tag based on whether it's in front of the camera and within culling range.
+        if (cameraSpaceLocation.z < 0 || distance > m_DistanceCullingRange)
+        {
+            m_NpcNameTag.style.display = DisplayStyle.None;
+        }
+        else
+        {
+            m_NpcNameTag.style.display = DisplayStyle.Flex;
+        }
+    }
+
+    Vector3 GetCameraSpaceLocation(Transform objectTransform)
+    {
+        // Get the size of the parent visual element of the name tag.
+        var containerSize = m_BaseContainer.layout.size;
+        var screenPoint = m_MainCamera.WorldToViewportPoint(objectTransform.position);
+        var output = new Vector3(screenPoint.x * containerSize.x, (1 - screenPoint.y) * containerSize.y, screenPoint.z);
+        
+        return output;
+    }
+}
\ No newline at end of file
diff --git a/move-element-at-runtime/Scripts/RandomMovement.cs b/move-element-at-runtime/Scripts/RandomMovement.cs
new file mode 100644
index 0000000..f6781fc
--- /dev/null
+++ b/move-element-at-runtime/Scripts/RandomMovement.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Serialization;
+using Random = UnityEngine.Random;
+
+public class RandomMovement : MonoBehaviour
+{
+    public float moveSpeed;
+
+    public float movementRange;
+
+    public Vector3 targetPosition;
+
+    private float m_PositionY;
+
+    // Initialize the starting position and target position of the GameObject.
+    void Start()
+    {
+        m_PositionY = transform.position.y;
+        targetPosition = new Vector3(0, m_PositionY, 0);
+    }
+
+    // Updates the position of the GameObject at fixed intervals.
+    // Move the GameObject towards the target position, and sets a new random target position when the current target is reached.
+    void FixedUpdate()
+    {
+        if (transform.position != targetPosition)
+        {
+            transform.position = Vector3.MoveTowards(transform.position, targetPosition, moveSpeed * Time.deltaTime);
+        }
+        else
+        {
+            targetPosition = new Vector3(Random.Range(-movementRange, movementRange), m_PositionY, Random.Range(-movementRange, movementRange));
+        }
+    }
+}
diff --git a/move-element-at-runtime/Scripts/SortElements.cs b/move-element-at-runtime/Scripts/SortElements.cs
new file mode 100644
index 0000000..3206b07
--- /dev/null
+++ b/move-element-at-runtime/Scripts/SortElements.cs
@@ -0,0 +1,31 @@
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+public class SortElements : MonoBehaviour
+{
+    [SerializeField]
+    UIDocument m_MovingElements;
+
+    VisualElement m_BaseContainer;
+
+    MovingNameTag[] m_MovingNameTags;
+    
+    void Start()
+    {
+        m_MovingNameTags = FindObjectsByType<MovingNameTag>(FindObjectsSortMode.None);
+        m_BaseContainer = m_MovingElements.rootVisualElement.Q<VisualElement>("BaseContainer");
+    }
+
+    void Update()
+    {
+        m_BaseContainer.Sort(CompareOrder);
+    }
+
+    static int CompareOrder(VisualElement x, VisualElement y)
+    {
+        // Compare the scale of the visual elements in the base container, which is
+        // determined by the distance of the object it follows in the MovingNameTag component
+        return x.style.scale.value.value.x.CompareTo(y.style.scale.value.value.x);
+    }
+}
diff --git a/move-element-at-runtime/UI/MovingElements.uxml b/move-element-at-runtime/UI/MovingElements.uxml
new file mode 100644
index 0000000..5c3968a
--- /dev/null
+++ b/move-element-at-runtime/UI/MovingElements.uxml
@@ -0,0 +1,3 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
+    <ui:VisualElement name="BaseContainer" style="flex-grow: 1;" />
+</ui:UXML>
diff --git a/move-element-at-runtime/UI/NameTag.uxml b/move-element-at-runtime/UI/NameTag.uxml
new file mode 100644
index 0000000..8737b7d
--- /dev/null
+++ b/move-element-at-runtime/UI/NameTag.uxml
@@ -0,0 +1,3 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
+    <ui:Label text="NPC" name="NameTag" picking-mode="Ignore" usage-hints="DynamicTransform" />
+</ui:UXML>

From 889fbba73d3565816cb9bd9218fc177039a0a4fe Mon Sep 17 00:00:00 2001
From: lilisha-unity <lisha.li@unity3d.com>
Date: Mon, 30 Dec 2024 17:58:12 +0000
Subject: [PATCH 29/53] Renamed folder name

---
 .../Scripts/MovingNameTag.cs                                      | 0
 .../Scripts/RandomMovement.cs                                     | 0
 .../Scripts/SortElements.cs                                       | 0
 .../UI/MovingElements.uxml                                        | 0
 .../UI/NameTag.uxml                                               | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename {move-element-at-runtime => move-elements-at-runtime}/Scripts/MovingNameTag.cs (100%)
 rename {move-element-at-runtime => move-elements-at-runtime}/Scripts/RandomMovement.cs (100%)
 rename {move-element-at-runtime => move-elements-at-runtime}/Scripts/SortElements.cs (100%)
 rename {move-element-at-runtime => move-elements-at-runtime}/UI/MovingElements.uxml (100%)
 rename {move-element-at-runtime => move-elements-at-runtime}/UI/NameTag.uxml (100%)

diff --git a/move-element-at-runtime/Scripts/MovingNameTag.cs b/move-elements-at-runtime/Scripts/MovingNameTag.cs
similarity index 100%
rename from move-element-at-runtime/Scripts/MovingNameTag.cs
rename to move-elements-at-runtime/Scripts/MovingNameTag.cs
diff --git a/move-element-at-runtime/Scripts/RandomMovement.cs b/move-elements-at-runtime/Scripts/RandomMovement.cs
similarity index 100%
rename from move-element-at-runtime/Scripts/RandomMovement.cs
rename to move-elements-at-runtime/Scripts/RandomMovement.cs
diff --git a/move-element-at-runtime/Scripts/SortElements.cs b/move-elements-at-runtime/Scripts/SortElements.cs
similarity index 100%
rename from move-element-at-runtime/Scripts/SortElements.cs
rename to move-elements-at-runtime/Scripts/SortElements.cs
diff --git a/move-element-at-runtime/UI/MovingElements.uxml b/move-elements-at-runtime/UI/MovingElements.uxml
similarity index 100%
rename from move-element-at-runtime/UI/MovingElements.uxml
rename to move-elements-at-runtime/UI/MovingElements.uxml
diff --git a/move-element-at-runtime/UI/NameTag.uxml b/move-elements-at-runtime/UI/NameTag.uxml
similarity index 100%
rename from move-element-at-runtime/UI/NameTag.uxml
rename to move-elements-at-runtime/UI/NameTag.uxml

From 575070c39ff0a1c1e42b43082e1dfca113364db7 Mon Sep 17 00:00:00 2001
From: lilisha-unity <lisha.li@unity3d.com>
Date: Wed, 8 Jan 2025 20:27:24 +0000
Subject: [PATCH 30/53] Updated code samples for the moving elements at runtime
 example.

---
 move-elements-at-runtime/Scripts/MovingNameTag.cs  | 3 +++
 move-elements-at-runtime/Scripts/RandomMovement.cs | 4 ----
 move-elements-at-runtime/UI/MovingElements.uxml    | 6 +++---
 move-elements-at-runtime/UI/NameTag.uxml           | 6 +++---
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/move-elements-at-runtime/Scripts/MovingNameTag.cs b/move-elements-at-runtime/Scripts/MovingNameTag.cs
index 1639503..9eb497c 100644
--- a/move-elements-at-runtime/Scripts/MovingNameTag.cs
+++ b/move-elements-at-runtime/Scripts/MovingNameTag.cs
@@ -32,6 +32,9 @@ void Awake()
         m_BaseContainer = m_BaseContainerDocument.rootVisualElement.Q<VisualElement>("BaseContainer");
         
         m_NpcNameTag = m_NameTagTemplate.Instantiate();
+
+        // Set DynamicTransform hint on the moving element to optimize performance.
+        m_NpcNameTag.usageHints = UsageHints.DynamicTransform;
         m_BaseContainer.Add(m_NpcNameTag);
         m_NpcNameTag.style.position = new StyleEnum<Position>(Position.Absolute);
     }
diff --git a/move-elements-at-runtime/Scripts/RandomMovement.cs b/move-elements-at-runtime/Scripts/RandomMovement.cs
index f6781fc..2eaac91 100644
--- a/move-elements-at-runtime/Scripts/RandomMovement.cs
+++ b/move-elements-at-runtime/Scripts/RandomMovement.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
-using UnityEngine.Serialization;
 using Random = UnityEngine.Random;
 
 public class RandomMovement : MonoBehaviour
diff --git a/move-elements-at-runtime/UI/MovingElements.uxml b/move-elements-at-runtime/UI/MovingElements.uxml
index 5c3968a..98e0db3 100644
--- a/move-elements-at-runtime/UI/MovingElements.uxml
+++ b/move-elements-at-runtime/UI/MovingElements.uxml
@@ -1,3 +1,3 @@
-<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
-    <ui:VisualElement name="BaseContainer" style="flex-grow: 1;" />
-</ui:UXML>
+<engine:UXML xmlns:engine="UnityEngine.UIElements" >
+    <engine:VisualElement name="BaseContainer" style="flex-grow: 1;" />
+</engine:UXML>
diff --git a/move-elements-at-runtime/UI/NameTag.uxml b/move-elements-at-runtime/UI/NameTag.uxml
index 8737b7d..daf4489 100644
--- a/move-elements-at-runtime/UI/NameTag.uxml
+++ b/move-elements-at-runtime/UI/NameTag.uxml
@@ -1,3 +1,3 @@
-<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
-    <ui:Label text="NPC" name="NameTag" picking-mode="Ignore" usage-hints="DynamicTransform" />
-</ui:UXML>
+<engine:UXML xmlns:engine="UnityEngine.UIElements">
+    <engine:Label text="NPC" name="NameTag" picking-mode="Ignore" />
+</engine:UXML>

From be50fdf0f8b49cb32bc8f71cd462b3046c7bf619 Mon Sep 17 00:00:00 2001
From: lilisha-unity <lisha.li@unity3d.com>
Date: Mon, 13 Jan 2025 19:17:38 +0000
Subject: [PATCH 31/53] Updated code samples for moving elements at runtime

---
 move-elements-at-runtime/Scripts/MovingNameTag.cs |  2 +-
 move-elements-at-runtime/UI/NameTag.uss           | 10 ++++++++++
 move-elements-at-runtime/UI/NameTag.uxml          |  1 +
 move-elements-at-runtime/UI/NameTagContainer.uxml |  3 +++
 4 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 move-elements-at-runtime/UI/NameTag.uss
 create mode 100644 move-elements-at-runtime/UI/NameTagContainer.uxml

diff --git a/move-elements-at-runtime/Scripts/MovingNameTag.cs b/move-elements-at-runtime/Scripts/MovingNameTag.cs
index 9eb497c..30ae577 100644
--- a/move-elements-at-runtime/Scripts/MovingNameTag.cs
+++ b/move-elements-at-runtime/Scripts/MovingNameTag.cs
@@ -59,7 +59,7 @@ void SetNameTagPositionAndScale()
 
         m_NpcNameTag.style.scale = new Scale(new Vector2(scale, scale));
         
-        / /Display name tag based on whether it's in front of the camera and within culling range.
+        // Display name tag based on whether it's in front of the camera and within culling range.
         if (cameraSpaceLocation.z < 0 || distance > m_DistanceCullingRange)
         {
             m_NpcNameTag.style.display = DisplayStyle.None;
diff --git a/move-elements-at-runtime/UI/NameTag.uss b/move-elements-at-runtime/UI/NameTag.uss
new file mode 100644
index 0000000..2cd3542
--- /dev/null
+++ b/move-elements-at-runtime/UI/NameTag.uss
@@ -0,0 +1,10 @@
+#NameTag {
+    /* This sets the position of the Label element to be absolute, rather than relative to the parent container. */
+    position: absolute;
+    /* This ensures that the pivot point of the Label element is centered, rather than in the top left corner.*/
+    translate: -50% -50%;
+    -unity-font-style: bold;
+    color: rgb(181, 210, 248);
+    -unity-text-outline-width: 1px;
+    -unity-text-outline-color: rgb(11, 60, 123);
+}
diff --git a/move-elements-at-runtime/UI/NameTag.uxml b/move-elements-at-runtime/UI/NameTag.uxml
index daf4489..5bdba22 100644
--- a/move-elements-at-runtime/UI/NameTag.uxml
+++ b/move-elements-at-runtime/UI/NameTag.uxml
@@ -1,3 +1,4 @@
 <engine:UXML xmlns:engine="UnityEngine.UIElements">
+    <Style src="NameTag.uss" />
     <engine:Label text="NPC" name="NameTag" picking-mode="Ignore" />
 </engine:UXML>
diff --git a/move-elements-at-runtime/UI/NameTagContainer.uxml b/move-elements-at-runtime/UI/NameTagContainer.uxml
new file mode 100644
index 0000000..98e0db3
--- /dev/null
+++ b/move-elements-at-runtime/UI/NameTagContainer.uxml
@@ -0,0 +1,3 @@
+<engine:UXML xmlns:engine="UnityEngine.UIElements" >
+    <engine:VisualElement name="BaseContainer" style="flex-grow: 1;" />
+</engine:UXML>

From 888fb056a2d88f18f283cfbcfb841453f2488f5c Mon Sep 17 00:00:00 2001
From: lilisha-unity <94024889+lilisha-unity@users.noreply.github.com>
Date: Tue, 14 Jan 2025 10:50:39 -0800
Subject: [PATCH 32/53] Update README.md to add move element at runtime doc
 link

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 0e2f7d7..3cdf621 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,7 @@ You must follow the steps in the UI Toolkit user manual to create the examples.
 ## Runtime UI examples
 
 - [Get started with runtime UI](https://docs.unity3d.com/Documentation/Manual/UIE-get-started-with-runtime-ui.html)
+- [Move elements at runtime](https://docs.unity3d.com/6000.1/Documentation/Manual/UIE-move-elements-at-runtime.html)
 
 
 ## Custom controls examples

From 006649415a96e668bb3058b717827fe3080d3324 Mon Sep 17 00:00:00 2001
From: lilisha-unity <lisha.li@unity3d.com>
Date: Wed, 14 May 2025 18:23:44 +0000
Subject: [PATCH 33/53] Added link tag example code

---
 README.md                            |  5 ++
 link-tag-example/Editor/LinkTag.cs   | 68 ++++++++++++++++++++++++++++
 link-tag-example/Editor/LinkTag.uss  | 10 ++++
 link-tag-example/Editor/LinkTag.uxml |  5 ++
 4 files changed, 88 insertions(+)
 create mode 100644 link-tag-example/Editor/LinkTag.cs
 create mode 100644 link-tag-example/Editor/LinkTag.uss
 create mode 100644 link-tag-example/Editor/LinkTag.uxml

diff --git a/README.md b/README.md
index 3cdf621..02ee7f1 100644
--- a/README.md
+++ b/README.md
@@ -69,4 +69,9 @@ You must follow the steps in the UI Toolkit user manual to create the examples.
 - [Create a pie chart in the Editor and runtime UI](https://docs.unity3d.com/2022.2/Documentation/Manual/UIE-pie-chart.html)
 - [Use Vector API to create a radial progress indicator](https://docs.unity3d.com/2022.2/Documentation/Manual/UIE-radial-progress-use-vector-api.html)
 
+## Text examples
+
+- [Get started with text](https://docs.unity3d.com/Manual/UIE-get-started-with-text.html)
+- [Add hyperlinks in text](https://docs.unity3d.com/Documentation/Manual/ui-systems/add-hyperlinks-in-text.html)
+
 
diff --git a/link-tag-example/Editor/LinkTag.cs b/link-tag-example/Editor/LinkTag.cs
new file mode 100644
index 0000000..fefc641
--- /dev/null
+++ b/link-tag-example/Editor/LinkTag.cs
@@ -0,0 +1,68 @@
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+using UnityEngine.UIElements.Experimental;
+
+public class LinkTag : EditorWindow
+{
+    [SerializeField]
+    private VisualTreeAsset m_VisualTreeAsset = default;
+
+    [MenuItem("Window/LinkTag Sample")]
+    public static void ShowExample()
+    {
+        LinkTag wnd = GetWindow<LinkTag>();
+        wnd.titleContent = new GUIContent("LinkTag Sample");
+    }
+
+    readonly string linkCursorClassName = "link-cursor";
+    Dictionary<int, string> m_UrlLookup;
+    Label linkLabel;
+
+    public void OnEnable()
+    {
+        // Use the dictionary to map link IDs to URLs.
+        // The link ID is the number in the link tag, and the URL is the destination.
+        // This is a simple example, in a real application you can define a more complex structure.
+        m_UrlLookup = new Dictionary<int, string>()
+        {
+            { 1, "https://www.google.com/" },
+            { 2, "https://discussions.unity.com/" }
+        };
+    }
+
+    public void CreateGUI()
+    {
+        VisualElement uxml = m_VisualTreeAsset.Instantiate();
+        rootVisualElement.Add(uxml);
+
+        linkLabel = rootVisualElement.Q<Label>(className: "link");
+
+        linkLabel.RegisterCallback<PointerDownLinkTagEvent>(HyperlinkOnPointerDown);
+        linkLabel.RegisterCallback<PointerUpLinkTagEvent>(HyperlinkOnPointerUp);
+        linkLabel.RegisterCallback<PointerMoveLinkTagEvent>(HyperlinkPointerMove);
+        linkLabel.RegisterCallback<PointerOverLinkTagEvent>(HyperlinkOnPointerOver);
+        linkLabel.RegisterCallback<PointerOutLinkTagEvent>(HyperlinkOnPointerOut);
+    }
+
+    void HyperlinkOnPointerOver(PointerOverLinkTagEvent _)
+    {
+        linkLabel.AddToClassList(linkCursorClassName);
+    }
+    void HyperlinkPointerMove(PointerMoveLinkTagEvent _) { }
+    void HyperlinkOnPointerOut(PointerOutLinkTagEvent _)
+    {
+        linkLabel.RemoveFromClassList(linkCursorClassName);
+    }
+
+    void HyperlinkOnPointerDown(PointerDownLinkTagEvent _) { }
+
+    void HyperlinkOnPointerUp(PointerUpLinkTagEvent evt)
+    {
+        var linkID = int.Parse(evt.linkID);
+        if (m_UrlLookup.TryGetValue(linkID, out var url))
+            Application.OpenURL(url);
+    }
+
+}
diff --git a/link-tag-example/Editor/LinkTag.uss b/link-tag-example/Editor/LinkTag.uss
new file mode 100644
index 0000000..ff9a2f5
--- /dev/null
+++ b/link-tag-example/Editor/LinkTag.uss
@@ -0,0 +1,10 @@
+Label {
+    font-size: 75px;
+}
+
+/*Turn the mouse pointer into a hand pointer when you hover over the link text.
+  Note that the cursor override for the link value doesn’t work at runtime.*/
+
+.link-cursor {
+    cursor: link;
+}
\ No newline at end of file
diff --git a/link-tag-example/Editor/LinkTag.uxml b/link-tag-example/Editor/LinkTag.uxml
new file mode 100644
index 0000000..2f3cb74
--- /dev/null
+++ b/link-tag-example/Editor/LinkTag.uxml
@@ -0,0 +1,5 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="True">
+    <Style src="LinkTag.uss" />
+    <ui:Label tabindex="-1" text="Link to &lt;link=&quot;1&quot;&gt;&lt;color=#40a0ff&gt;&lt;u&gt;Unity&lt;/u&gt;&lt;/color&gt;&lt;/link&gt;&#10;Link to &lt;link=&quot;2&quot;&gt;&lt;color=#40a0ff&gt;&lt;u&gt;UITK Discussions&lt;/u&gt;&lt;/color&gt;&lt;/link&gt;!" display-tooltip-when-elided="true" enable-rich-text="true" selectable="true" emoji-fallback-support="false" class="link" />
+    <ui:Label tabindex="-1" text="Link to &lt;a href=&quot;https://www.google.com/&quot;&gt;&lt;u&gt;Google&lt;/u&gt;&lt;/a&gt; using &lt;noparse&gt;&lt;a&gt;&lt;/noparse&gt; tag." display-tooltip-when-elided="true" name="Label" />
+</ui:UXML>
\ No newline at end of file

From 0bbce11508aca82f6445938b0f0643c4f5ddcaf5 Mon Sep 17 00:00:00 2001
From: lilisha-unity <94024889+lilisha-unity@users.noreply.github.com>
Date: Wed, 21 May 2025 14:17:56 -0700
Subject: [PATCH 34/53] Removed redundant text from the comments.

---
 radial-progress/RadialProgress.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/radial-progress/RadialProgress.cs b/radial-progress/RadialProgress.cs
index f9e7010..39b30a4 100644
--- a/radial-progress/RadialProgress.cs
+++ b/radial-progress/RadialProgress.cs
@@ -125,7 +125,7 @@ static void GenerateVisualContent(MeshGenerationContext context)
 
         // DrawMeshes() uses the EllipseMesh utility class to generate an array of vertices and indices, for both the
         // "track" ring (in grey) and the progress ring (in green). It then passes the geometry to the MeshWriteData
-        // object, as returned by the MeshGenerationContext.Allocate() method. For the "progress" __mesh__The main graphics primitive of Unity. Meshes make up a large part of your 3D worlds. Unity supports triangulated or Quadrangulated polygon meshes. Nurbs, Nurms, Subdiv surfaces must be converted to polygons. [More info](comp-MeshGroup.html)<span class="tooltipGlossaryLink">See in [Glossary](Glossary.html#Mesh)</span>, only a slice of
+        // object, as returned by the MeshGenerationContext.Allocate() method. For the "progress", only a slice of
         // the index arrays is used to progressively reveal parts of the mesh.
         void DrawMeshes(MeshGenerationContext context)
         {
@@ -171,4 +171,4 @@ void DrawMeshes(MeshGenerationContext context)
         }
 
     }
-}
\ No newline at end of file
+}

From 355150257aa8b86b3fd2be113467c7123ea9b7c6 Mon Sep 17 00:00:00 2001
From: lilisha-unity <lisha.li@unity3d.com>
Date: Wed, 28 May 2025 15:30:55 +0000
Subject: [PATCH 35/53] Updated code samples.

---
 create-a-custom-inspector/Editor/Car_Inspector.cs       | 8 ++++----
 create-a-custom-inspector/Editor/Tire_PropertyDrawer.cs | 5 +----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/create-a-custom-inspector/Editor/Car_Inspector.cs b/create-a-custom-inspector/Editor/Car_Inspector.cs
index 0d1b583..448b8f1 100644
--- a/create-a-custom-inspector/Editor/Car_Inspector.cs
+++ b/create-a-custom-inspector/Editor/Car_Inspector.cs
@@ -8,11 +8,11 @@ public class Car_Inspector : Editor
     public VisualTreeAsset m_InspectorXML;
     public override VisualElement CreateInspectorGUI()
     {
-        // Create a new VisualElement to be the root of the Inspector UI.
-        VisualElement myInspector = new VisualElement();
+        // Load the reference UXML.
+        m_InspectorXML= AssetDatabase.LoadAssetAtPath<VisualTreeAsset>("Assets/create-a-custom-inspector/Car_Inspector_UXML.uxml");
 
-        // Load from default reference.
-        m_InspectorXML.CloneTree(myInspector);
+        // Instantiate the UXML.
+        VisualElement myInspector = m_InspectorXML.Instantiate();
 
         // Get a reference to the default Inspector Foldout control.
         VisualElement InspectorFoldout = myInspector.Q("Default_Inspector");
diff --git a/create-a-custom-inspector/Editor/Tire_PropertyDrawer.cs b/create-a-custom-inspector/Editor/Tire_PropertyDrawer.cs
index 91f0f98..1e8e8b5 100644
--- a/create-a-custom-inspector/Editor/Tire_PropertyDrawer.cs
+++ b/create-a-custom-inspector/Editor/Tire_PropertyDrawer.cs
@@ -7,9 +7,6 @@ public class Tire_PropertyDrawer : PropertyDrawer
 {
     public override VisualElement CreatePropertyGUI(SerializedProperty property)
     {
-        // Create a new VisualElement to be the root the property UI.
-        var container = new VisualElement();
-
         // Create drawer UI using C#.
         var popup = new UnityEngine.UIElements.PopupWindow();
         popup.text = "Tire Details";
@@ -20,4 +17,4 @@ public override VisualElement CreatePropertyGUI(SerializedProperty property)
         // Return the finished UI.
         return container;
     }
-}
+}
\ No newline at end of file

From 1e787491aa7333d781f8b91fdbcdd0b252556f18 Mon Sep 17 00:00:00 2001
From: lilisha-unity <lisha.li@unity3d.com>
Date: Fri, 6 Jun 2025 16:44:15 +0000
Subject: [PATCH 36/53] Added text animation sample code.

---
 .../Editor/TextAnimation.cs                   | 91 +++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 create-custom-text-animation/Editor/TextAnimation.cs

diff --git a/create-custom-text-animation/Editor/TextAnimation.cs b/create-custom-text-animation/Editor/TextAnimation.cs
new file mode 100644
index 0000000..07a7511
--- /dev/null
+++ b/create-custom-text-animation/Editor/TextAnimation.cs
@@ -0,0 +1,91 @@
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+using TextElement = UnityEngine.UIElements.TextElement;
+
+public class TextAnimation : EditorWindow
+{
+    [MenuItem("Window/UI Toolkit/TextAnimation")]
+    public static void ShowExample()
+    {
+        TextAnimation wnd = GetWindow<TextAnimation>();
+        wnd.titleContent = new GUIContent("TextAnimation");
+    }
+
+    Label label;
+    float animationDuration = 10f;
+    float elapsed = 0f;
+    IVisualElementScheduledItem animationJob;
+    bool isTextVisible = true;
+
+    public void CreateGUI()
+    {
+        VisualElement root = rootVisualElement;
+
+        var container = new VisualElement()
+        {
+            style =
+            {
+                flexGrow = 1,
+                top = 0,
+                bottom = 0,
+                right = 0,
+                left = 0
+            },
+            focusable = true // We can only receive key events on a window with a focusable element.
+        };
+        label = new Label("Hello ❤️ World!") { style = { flexGrow = 1, fontSize = 24, unityTextAlign = TextAnchor.MiddleCenter } };
+        container.Add(label);
+        root.Add(container);
+
+        rootVisualElement.RegisterCallback<KeyDownEvent>(evt => OnSpacebarPressed(evt), TrickleDown.TrickleDown);
+        label.PostProcessTextVertices += OnPostProcessTextVertices;
+
+        animationJob = label.schedule.Execute(UpdateTime).Every(1000 / 60); // 60 FPS
+        animationJob.Pause(); // Pause the job until the animation starts
+    }
+
+    private void UpdateTime()
+    {
+        elapsed += Time.deltaTime;
+        if (elapsed >= animationDuration)
+        {
+            elapsed = animationDuration; // Cap at max duration
+            animationJob.Pause();
+        }
+
+        label.MarkDirtyRepaint();
+    }
+
+    public void OnSpacebarPressed(KeyDownEvent evt)
+    {
+        if (evt.keyCode != KeyCode.Space || animationJob.isActive)
+            return;
+
+        elapsed = 0f;
+        animationJob.Resume();
+        isTextVisible = !isTextVisible;
+    }
+
+    void OnPostProcessTextVertices(TextElement.GlyphsEnumerable glyphs)
+    {
+        int glyphsToToggle = (int)(elapsed * glyphs.Count / animationDuration);
+
+        int toggled = 0;
+        foreach (TextElement.Glyph glyph in glyphs)
+        {
+            if (toggled++ >= glyphsToToggle)
+                break;
+
+            var verts = glyph.vertices;
+            for (int i = 0; i < verts.Length; i++)
+            {
+                var v = verts[i];
+                var tint = v.tint;
+                tint.a = isTextVisible ? (byte)255 : (byte)0;
+                v.tint = tint;
+                verts[i] = v;
+            }
+        }
+    }
+}
\ No newline at end of file

From 0e5609faffd11aabae94f321c08a7b250f504f89 Mon Sep 17 00:00:00 2001
From: lilisha-unity <lisha.li@unity3d.com>
Date: Fri, 6 Jun 2025 16:45:53 +0000
Subject: [PATCH 37/53] Renamed folder

---
 .../Editor/TextAnimation.cs                                       | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {create-custom-text-animation => text-animation-example}/Editor/TextAnimation.cs (100%)

diff --git a/create-custom-text-animation/Editor/TextAnimation.cs b/text-animation-example/Editor/TextAnimation.cs
similarity index 100%
rename from create-custom-text-animation/Editor/TextAnimation.cs
rename to text-animation-example/Editor/TextAnimation.cs

From 7996c27f10b3b27d3460b89c54b6a9b19fc68dfa Mon Sep 17 00:00:00 2001
From: Martin Cote <martinc@unity3d.com>
Date: Thu, 3 Jul 2025 11:40:09 -0400
Subject: [PATCH 38/53] Updated swirl shader with _UVRect

---
 .../SwirlFilter/Swirl.shader                  | 40 +++++++++++++++----
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader b/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader
index be61fab..cd33e7a 100644
--- a/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader
+++ b/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader
@@ -18,7 +18,7 @@ Shader "Unlit/Swirl"
             #pragma vertex vert
             #pragma fragment frag
 
-            #include "UnityCG.hlsl"
+            #include "UnityCG.cginc"
 
             struct appdata
             {
@@ -38,9 +38,29 @@ Shader "Unlit/Swirl"
 
             SamplerState my_linear_repeat_sampler;
 
+            float4 _UVRect; // UV rectangle for the texture (x, y, width, height)
+
             float _Angle;
             float _Radius;
 
+            float2 NormalizeUVs(float2 uv)
+            {
+                // Normalize UV coordinates based on the atlas rect
+                return float2(
+                    (uv.x - _UVRect.x) / _UVRect.z,
+                    (uv.y - _UVRect.y) / _UVRect.w
+                );
+            }
+
+            float2 MapToUVRect(float2 uv)
+            {
+                // Map UV coordinates to the atlas rect
+                return float2(
+                    uv.x * _UVRect.z + _UVRect.x,
+                    uv.y * _UVRect.w + _UVRect.y
+                );
+            }
+
             v2f vert (appdata v)
             {
                 v2f o;
@@ -51,21 +71,25 @@ Shader "Unlit/Swirl"
 
             fixed4 frag (v2f i) : SV_Target
             {
+                // Convert the atlas UVs to the 0-1 range
+                float2 uv = NormalizeUVs(i.uv);
+
                 float effectRadius = _Radius;
                 float effectAngle = _Angle;
-                
+
                 float2 center = float2(0.5, 0.5);
-                
-                float2 uv = i.uv - center;
-                
+
+                uv = uv - center;
                 float len = length(uv * float2(_MainTex_TexelSize.z * _MainTex_TexelSize.y, 1.));
                 float angle = atan2(uv.y, uv.x) + effectAngle * smoothstep(effectRadius, 0., len);
                 float radius = length(uv);
 
                 uv = radius * float2(cos(angle), sin(angle)) + center;
-                fixed4 fragColor = _MainTex.Sample(my_linear_repeat_sampler, uv);
-                
-                return fragColor;
+
+                // Map the UVs back to the atlas rect
+                uv = MapToUVRect(uv);
+
+                return _MainTex.Sample(my_linear_repeat_sampler, uv);
             }
             ENDCG
         }

From 72aa316122532d4f60b07b835e380411a06676a4 Mon Sep 17 00:00:00 2001
From: Martin Cote <martinc@unity3d.com>
Date: Thu, 10 Jul 2025 13:09:52 -0400
Subject: [PATCH 39/53] Update

---
 .../SwirlFilter/Swirl.shader                  | 67 ++++++++-----------
 1 file changed, 28 insertions(+), 39 deletions(-)

diff --git a/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader b/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader
index cd33e7a..6844220 100644
--- a/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader
+++ b/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader
@@ -7,10 +7,7 @@ Shader "Unlit/Swirl"
     SubShader
     {
         Tags { "RenderType"="Opaque" }
-        Blend One OneMinusSrcAlpha
-        ZWrite Off
-        ZTest Always 
-        Cull Off
+        LOD 100
 
         Pass
         {
@@ -19,79 +16,71 @@ Shader "Unlit/Swirl"
             #pragma fragment frag
 
             #include "UnityCG.cginc"
-
-            struct appdata
-            {
-                float4 vertex : POSITION;
-                float2 uv : TEXCOORD0;
-            };
+            #include "UnityUIEFilter.cginc"
 
             struct v2f
             {
-                float2 uv : TEXCOORD0;
                 float4 vertex : SV_POSITION;
+                float2 uv : TEXCOORD0;
+                uint rectIndex : TEXCOORD1;
             };
 
-            Texture2D _MainTex;
+            sampler2D _MainTex;
             float4 _MainTex_ST;
             float4 _MainTex_TexelSize;
 
-            SamplerState my_linear_repeat_sampler;
-
-            float4 _UVRect; // UV rectangle for the texture (x, y, width, height)
-
             float _Angle;
             float _Radius;
 
-            float2 NormalizeUVs(float2 uv)
+            v2f vert (FilterVertexInput v)
+            {
+                v2f o;
+                o.vertex = UnityObjectToClipPos(v.vertex);
+                o.uv = TRANSFORM_TEX(v.uv, _MainTex);
+                o.rectIndex = GetFilterRectIndex(v);
+                return o;
+            }
+
+            float2 NormalizeUVs(float2 uv, float4 uvRect)
             {
                 // Normalize UV coordinates based on the atlas rect
                 return float2(
-                    (uv.x - _UVRect.x) / _UVRect.z,
-                    (uv.y - _UVRect.y) / _UVRect.w
+                    (uv.x - uvRect.x) / uvRect.z,
+                    (uv.y - uvRect.y) / uvRect.w
                 );
             }
 
-            float2 MapToUVRect(float2 uv)
+            float2 MapToUVRect(float2 uv, float4 uvRect)
             {
                 // Map UV coordinates to the atlas rect
                 return float2(
-                    uv.x * _UVRect.z + _UVRect.x,
-                    uv.y * _UVRect.w + _UVRect.y
+                    uv.x * uvRect.z + uvRect.x,
+                    uv.y * uvRect.w + uvRect.y
                 );
             }
 
-            v2f vert (appdata v)
-            {
-                v2f o;
-                o.vertex = UnityObjectToClipPos(v.vertex);
-                o.uv = TRANSFORM_TEX(v.uv, _MainTex);
-                return o;
-            }
-
             fixed4 frag (v2f i) : SV_Target
             {
-                // Convert the atlas UVs to the 0-1 range
-                float2 uv = NormalizeUVs(i.uv);
-
+                // https://www.shadertoy.com/view/Xscyzn
                 float effectRadius = _Radius;
                 float effectAngle = _Angle;
 
-                float2 center = float2(0.5, 0.5);
+                float4 uvRect = GetFilterUVRect(i.rectIndex);
 
+                float2 uv = NormalizeUVs(i.uv, uvRect);
+                float2 center = float2(0.5, 0.5);
                 uv = uv - center;
+
                 float len = length(uv * float2(_MainTex_TexelSize.z * _MainTex_TexelSize.y, 1.));
                 float angle = atan2(uv.y, uv.x) + effectAngle * smoothstep(effectRadius, 0., len);
                 float radius = length(uv);
 
                 uv = radius * float2(cos(angle), sin(angle)) + center;
+                uv = MapToUVRect(uv, uvRect);
 
-                // Map the UVs back to the atlas rect
-                uv = MapToUVRect(uv);
-
-                return _MainTex.Sample(my_linear_repeat_sampler, uv);
+                return tex2D(_MainTex, uv);
             }
             ENDCG
         }
     }
-}
+}
\ No newline at end of file

From e84a2dd9803d2d1d58dd0b5fdcafb114544ab52c Mon Sep 17 00:00:00 2001
From: Martin Cote <martinc@unity3d.com>
Date: Tue, 15 Jul 2025 09:11:50 -0400
Subject: [PATCH 40/53] Update

---
 create-a-custom-swirl-filter/SwirlFilter/Swirl.shader | 1 -
 1 file changed, 1 deletion(-)

diff --git a/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader b/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader
index 6844220..8756d8a 100644
--- a/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader
+++ b/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader
@@ -61,7 +61,6 @@ Shader "Unlit/Swirl"
 
             fixed4 frag (v2f i) : SV_Target
             {
-                // https://www.shadertoy.com/view/Xscyzn
                 float effectRadius = _Radius;
                 float effectAngle = _Angle;
 

From 111fcc9a4d70f91f7e303b96ddfcee920fb02cd1 Mon Sep 17 00:00:00 2001
From: Martin Cote <martinc@unity3d.com>
Date: Tue, 15 Jul 2025 09:15:41 -0400
Subject: [PATCH 41/53] Update

---
 create-a-custom-swirl-filter/SwirlFilter/Swirl.shader | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader b/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader
index 8756d8a..95b1c3d 100644
--- a/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader
+++ b/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader
@@ -7,7 +7,10 @@ Shader "Unlit/Swirl"
     SubShader
     {
         Tags { "RenderType"="Opaque" }
-        LOD 100
+        Blend One OneMinusSrcAlpha
+        ZWrite Off
+        ZTest Always
+        Cull Off
 
         Pass
         {

From 94e26a10bd4f5b622b8a58d6de18a7dac7a4a1a1 Mon Sep 17 00:00:00 2001
From: lisha-li <lisha.li@unity3d.com>
Date: Thu, 23 Jan 2025 11:06:33 -0800
Subject: [PATCH 42/53] Replace AssetDatabase.FindAssets with a new search API

---
 .../MyCustomEditor.cs                         | 101 +++++++++---------
 1 file changed, 52 insertions(+), 49 deletions(-)

diff --git a/create-a-custom-editor-window-with-CSharp/MyCustomEditor.cs b/create-a-custom-editor-window-with-CSharp/MyCustomEditor.cs
index 92d6cc0..e76638b 100644
--- a/create-a-custom-editor-window-with-CSharp/MyCustomEditor.cs
+++ b/create-a-custom-editor-window-with-CSharp/MyCustomEditor.cs
@@ -18,64 +18,67 @@ public static void ShowMyEditor()
         // Limit size of the window.
         wnd.minSize = new Vector2(450, 200);
         wnd.maxSize = new Vector2(1920, 720);
-  }
+    }
 
-  public void CreateGUI()
-  {
-      // Get a list of all sprites in the project.
-      var allObjectGuids = AssetDatabase.FindAssets("t:Sprite");
-      var allObjects = new List<Sprite>();
-      foreach (var guid in allObjectGuids)
-      {
-        allObjects.Add(AssetDatabase.LoadAssetAtPath<Sprite>(AssetDatabase.GUIDToAssetPath(guid)));
-      }
+    public void CreateGUI()
+    {
+        // Get a list of all sprites in the project.
+        var query = AssetDatabase.SourceSearchQuery.ByImporter(typeof(TextureImporter));
+        var results = AssetDatabase.SearchAsync(query, System.Threading.CancellationToken.None).Result.Items;
+        var allObjects = new List<Sprite>();
+        foreach (var result in results)
+        {
+            var sprite = AssetDatabase.LoadAssetAtPath<Sprite>(AssetDatabase.GUIDToAssetPath(result.guid));
+            if (sprite != null)
+                allObjects.Add(sprite);
+        }
 
-      // Create a two-pane view with the left pane being fixed.
-      var splitView = new TwoPaneSplitView(0, 250, TwoPaneSplitViewOrientation.Horizontal);
+        // Create a two-pane view with the left pane being fixed.
+        var splitView = new TwoPaneSplitView(0, 250, TwoPaneSplitViewOrientation.Horizontal);
 
-      // Add the panel to the visual tree by adding it as a child to the root element.
-      rootVisualElement.Add(splitView);
+        // Add the panel to the visual tree by adding it as a child to the root element.
+        rootVisualElement.Add(splitView);
 
-      // A TwoPaneSplitView always needs two child elements.
-      var leftPane = new ListView();
-      splitView.Add(leftPane);
-      m_RightPane = new ScrollView(ScrollViewMode.VerticalAndHorizontal);
-      splitView.Add(m_RightPane);
+        // A TwoPaneSplitView always needs two child elements.
+        var leftPane = new ListView();
+        splitView.Add(leftPane);
+        m_RightPane = new ScrollView(ScrollViewMode.VerticalAndHorizontal);
+        splitView.Add(m_RightPane);
 
-      // Initialize the list view with all sprites' names.
-      leftPane.makeItem = () => new Label();
-      leftPane.bindItem = (item, index) => { (item as Label).text = allObjects[index].name; };
-      leftPane.itemsSource = allObjects;
+        // Initialize the list view with all sprites' names.
+        leftPane.makeItem = () => new Label();
+        leftPane.bindItem = (item, index) => { (item as Label).text = allObjects[index].name; };
+        leftPane.itemsSource = allObjects;
 
-      // React to the user's selection.
-      leftPane.selectionChanged += OnSpriteSelectionChange;
+        // React to the user's selection.
+        leftPane.selectionChanged += OnSpriteSelectionChange;
 
-      // Restore the selection index from before the hot reload.
-      leftPane.selectedIndex = m_SelectedIndex;
+        // Restore the selection index from before the hot reload.
+        leftPane.selectedIndex = m_SelectedIndex;
 
-      // Store the selection index when the selection changes.
-      leftPane.selectionChanged += (items) => { m_SelectedIndex = leftPane.selectedIndex; };
-  }
+        // Store the selection index when the selection changes.
+        leftPane.selectionChanged += (items) => { m_SelectedIndex = leftPane.selectedIndex; };
+    }
 
-  private void OnSpriteSelectionChange(IEnumerable<object> selectedItems)
-  {
-      // Clear all previous content from the pane.
-      m_RightPane.Clear();
+    private void OnSpriteSelectionChange(IEnumerable<object> selectedItems)
+    {
+        // Clear all previous content from the pane.
+        m_RightPane.Clear();
 
-      var enumerator = selectedItems.GetEnumerator();
-      if (enumerator.MoveNext())
-      {
-          var selectedSprite = enumerator.Current as Sprite;
-          if (selectedSprite != null)
-          {
-              // Add a new Image control and display the sprite.
-              var spriteImage = new Image();
-              spriteImage.scaleMode = ScaleMode.ScaleToFit;
-              spriteImage.sprite = selectedSprite;
+        var enumerator = selectedItems.GetEnumerator();
+        if (enumerator.MoveNext())
+        {
+            var selectedSprite = enumerator.Current as Sprite;
+            if (selectedSprite != null)
+            {
+                // Add a new Image control and display the sprite.
+                var spriteImage = new Image();
+                spriteImage.scaleMode = ScaleMode.ScaleToFit;
+                spriteImage.sprite = selectedSprite;
 
-              // Add the Image control to the right-hand pane.
-              m_RightPane.Add(spriteImage);
-          }
-      }
-  }
+                // Add the Image control to the right-hand pane.
+                m_RightPane.Add(spriteImage);
+            }
+        }
+    }
 }
\ No newline at end of file

From 04dd0881a1fa7569d4904d71c87a446b9cfe82ee Mon Sep 17 00:00:00 2001
From: lisha-li <lisha.li@unity3d.com>
Date: Wed, 8 Oct 2025 10:24:38 -0700
Subject: [PATCH 43/53] Renamed asset to remove extra f in file name.

---
 .../{SwirlfFilterFunction.asset => SwirlFilterFunction.asset}   | 0
 create-a-custom-swirl-filter/SwirlFilterExample.uss             | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename create-a-custom-swirl-filter/SwirlFilter/{SwirlfFilterFunction.asset => SwirlFilterFunction.asset} (100%)

diff --git a/create-a-custom-swirl-filter/SwirlFilter/SwirlfFilterFunction.asset b/create-a-custom-swirl-filter/SwirlFilter/SwirlFilterFunction.asset
similarity index 100%
rename from create-a-custom-swirl-filter/SwirlFilter/SwirlfFilterFunction.asset
rename to create-a-custom-swirl-filter/SwirlFilter/SwirlFilterFunction.asset
diff --git a/create-a-custom-swirl-filter/SwirlFilterExample.uss b/create-a-custom-swirl-filter/SwirlFilterExample.uss
index 2920536..fc872d1 100644
--- a/create-a-custom-swirl-filter/SwirlFilterExample.uss
+++ b/create-a-custom-swirl-filter/SwirlFilterExample.uss
@@ -19,5 +19,5 @@
 }
 
 .filterEffect {
-    filter: filter("SwirlFilter/SwirlfFilterFunction.asset" 58.9 2.3);
+    filter: filter("SwirlFilter/SwirlFilterFunction.asset" 58.9 2.3);
 }

From 400661b059fe1a72bdcbded7974886229188d596 Mon Sep 17 00:00:00 2001
From: Martin Cote <martinc@unity3d.com>
Date: Wed, 22 Oct 2025 12:41:33 -0400
Subject: [PATCH 44/53] Fixed swirl filter function

---
 .../SwirlFilter/Swirl.mat                        |  2 +-
 .../SwirlFilter/Swirl.mat.meta                   |  8 ++++++++
 .../SwirlFilter/Swirl.shader                     |  2 +-
 .../SwirlFilter/Swirl.shader.meta                |  9 +++++++++
 .../SwirlFilter/SwirlFilterFunction.asset        | 16 +++++++++-------
 .../SwirlFilter/SwirlFilterFunction.asset.meta   |  8 ++++++++
 6 files changed, 36 insertions(+), 9 deletions(-)
 create mode 100644 create-a-custom-swirl-filter/SwirlFilter/Swirl.mat.meta
 create mode 100644 create-a-custom-swirl-filter/SwirlFilter/Swirl.shader.meta
 create mode 100644 create-a-custom-swirl-filter/SwirlFilter/SwirlFilterFunction.asset.meta

diff --git a/create-a-custom-swirl-filter/SwirlFilter/Swirl.mat b/create-a-custom-swirl-filter/SwirlFilter/Swirl.mat
index 7cfa18e..2a89c58 100644
--- a/create-a-custom-swirl-filter/SwirlFilter/Swirl.mat
+++ b/create-a-custom-swirl-filter/SwirlFilter/Swirl.mat
@@ -8,7 +8,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Swirl
-  m_Shader: {fileID: 4800000, guid: 854a2ef897d5241a9aee8b5c37efdae1, type: 3}
+  m_Shader: {fileID: 4800000, guid: 5dbb6a0cc7d83894dbc7350392d137af, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
diff --git a/create-a-custom-swirl-filter/SwirlFilter/Swirl.mat.meta b/create-a-custom-swirl-filter/SwirlFilter/Swirl.mat.meta
new file mode 100644
index 0000000..3ac7e80
--- /dev/null
+++ b/create-a-custom-swirl-filter/SwirlFilter/Swirl.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 19988972054669741a269d01b4c735aa
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader b/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader
index 95b1c3d..628d643 100644
--- a/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader
+++ b/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader
@@ -7,7 +7,7 @@ Shader "Unlit/Swirl"
     SubShader
     {
         Tags { "RenderType"="Opaque" }
-        Blend One OneMinusSrcAlpha
+        Blend One Zero
         ZWrite Off
         ZTest Always
         Cull Off
diff --git a/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader.meta b/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader.meta
new file mode 100644
index 0000000..834e9a1
--- /dev/null
+++ b/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 5dbb6a0cc7d83894dbc7350392d137af
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/create-a-custom-swirl-filter/SwirlFilter/SwirlFilterFunction.asset b/create-a-custom-swirl-filter/SwirlFilter/SwirlFilterFunction.asset
index a247434..f20ed0b 100644
--- a/create-a-custom-swirl-filter/SwirlFilter/SwirlFilterFunction.asset
+++ b/create-a-custom-swirl-filter/SwirlFilter/SwirlFilterFunction.asset
@@ -9,21 +9,23 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 19106, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: SwirlfFilterFunction
-  m_EditorClassIdentifier: 
-  m_FilterName: swirl
+  m_Script: {fileID: 19107, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: SwirlFilterFunction
+  m_EditorClassIdentifier: UnityEngine.dll::UnityEngine.UIElements.FilterFunctionDefinition
+  m_FilterName: 
   m_Parameters:
-  - m_InterpolationDefaultValue:
+  - m_Name: angle
+    m_InterpolationDefaultValue:
       m_Type: 0
       m_FloatValue: 0
       m_ColorValue: {r: 0, g: 0, b: 0, a: 0}
-  - m_InterpolationDefaultValue:
+  - m_Name: radius
+    m_InterpolationDefaultValue:
       m_Type: 0
       m_FloatValue: 0
       m_ColorValue: {r: 0, g: 0, b: 0, a: 0}
   m_Passes:
-  - m_Material: {fileID: 2100000, guid: 9849d10efcac8074da47726363a7baca, type: 2}
+  - m_Material: {fileID: 160154789899534285, guid: ee6641ed38cea074db929e71fd4664d8, type: 3}
     m_PassIndex: 0
     m_ParameterBindings:
     - m_Index: 0
diff --git a/create-a-custom-swirl-filter/SwirlFilter/SwirlFilterFunction.asset.meta b/create-a-custom-swirl-filter/SwirlFilter/SwirlFilterFunction.asset.meta
new file mode 100644
index 0000000..08ae484
--- /dev/null
+++ b/create-a-custom-swirl-filter/SwirlFilter/SwirlFilterFunction.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4d0a7b05ec25eec47b5bb46be70e73da
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

From 07d29722d0bb01e62ac7f26d47379877f2e7bceb Mon Sep 17 00:00:00 2001
From: Martin Cote <martinc@unity3d.com>
Date: Wed, 22 Oct 2025 13:43:03 -0400
Subject: [PATCH 45/53] Fixed mat reference

---
 .../SwirlFilter/SwirlFilterFunction.asset                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/create-a-custom-swirl-filter/SwirlFilter/SwirlFilterFunction.asset b/create-a-custom-swirl-filter/SwirlFilter/SwirlFilterFunction.asset
index f20ed0b..e6d79b8 100644
--- a/create-a-custom-swirl-filter/SwirlFilter/SwirlFilterFunction.asset
+++ b/create-a-custom-swirl-filter/SwirlFilter/SwirlFilterFunction.asset
@@ -25,7 +25,7 @@ MonoBehaviour:
       m_FloatValue: 0
       m_ColorValue: {r: 0, g: 0, b: 0, a: 0}
   m_Passes:
-  - m_Material: {fileID: 160154789899534285, guid: ee6641ed38cea074db929e71fd4664d8, type: 3}
+  - m_Material: {fileID: 2100000, guid: 19988972054669741a269d01b4c735aa, type: 2}
     m_PassIndex: 0
     m_ParameterBindings:
     - m_Index: 0

From f9e696f3a8e7e0b47eea1daa77c53a16aaf571ae Mon Sep 17 00:00:00 2001
From: lisha-li <lisha.li@unity3d.com>
Date: Thu, 11 Dec 2025 14:02:58 -0800
Subject: [PATCH 46/53] Updated the swirl shader files.

---
 .../SwirlFilter/Swirl.mat                     |   5 +-
 .../SwirlFilter/Swirl.mat.meta                |   4 +-
 .../SwirlFilter/Swirl.shader                  | 181 +++++++++---------
 .../SwirlFilter/Swirl.shader.meta             |   2 +-
 ...FilterFunction.asset => SwirlFilter.asset} |   6 +-
 ...tion.asset.meta => SwirlFilter.asset.meta} |   2 +-
 6 files changed, 104 insertions(+), 96 deletions(-)
 rename create-a-custom-swirl-filter/SwirlFilter/{SwirlFilterFunction.asset => SwirlFilter.asset} (88%)
 rename create-a-custom-swirl-filter/SwirlFilter/{SwirlFilterFunction.asset.meta => SwirlFilter.asset.meta} (78%)

diff --git a/create-a-custom-swirl-filter/SwirlFilter/Swirl.mat b/create-a-custom-swirl-filter/SwirlFilter/Swirl.mat
index 2a89c58..653e928 100644
--- a/create-a-custom-swirl-filter/SwirlFilter/Swirl.mat
+++ b/create-a-custom-swirl-filter/SwirlFilter/Swirl.mat
@@ -8,10 +8,11 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Swirl
-  m_Shader: {fileID: 4800000, guid: 5dbb6a0cc7d83894dbc7350392d137af, type: 3}
+  m_Shader: {fileID: 4800000, guid: a0086fb18538742a0b09fc35e29d48e7, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
+  m_ValidKeywords:
+  - _UIE_OUTPUT_LINEAR
   m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
diff --git a/create-a-custom-swirl-filter/SwirlFilter/Swirl.mat.meta b/create-a-custom-swirl-filter/SwirlFilter/Swirl.mat.meta
index 3ac7e80..d55534e 100644
--- a/create-a-custom-swirl-filter/SwirlFilter/Swirl.mat.meta
+++ b/create-a-custom-swirl-filter/SwirlFilter/Swirl.mat.meta
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 19988972054669741a269d01b4c735aa
+guid: 410b26533861d4ad5b736c33ea860dd0
 NativeFormatImporter:
   externalObjects: {}
-  mainObjectFileID: 0
+  mainObjectFileID: 2100000
   userData: 
   assetBundleName: 
   assetBundleVariant: 
diff --git a/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader b/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader
index 628d643..ecad2c5 100644
--- a/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader
+++ b/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader
@@ -1,88 +1,95 @@
-Shader "Unlit/Swirl"
-{
-    Properties
-    {
-        _MainTex ("Texture", 2D) = "white" {}
-    }
-    SubShader
-    {
-        Tags { "RenderType"="Opaque" }
-        Blend One Zero
-        ZWrite Off
-        ZTest Always
-        Cull Off
-
-        Pass
-        {
-            CGPROGRAM
-            #pragma vertex vert
-            #pragma fragment frag
-
-            #include "UnityCG.cginc"
-            #include "UnityUIEFilter.cginc"
-
-            struct v2f
-            {
-                float4 vertex : SV_POSITION;
-                float2 uv : TEXCOORD0;
-                uint rectIndex : TEXCOORD1;
-            };
-
-            sampler2D _MainTex;
-            float4 _MainTex_ST;
-            float4 _MainTex_TexelSize;
-
-            float _Angle;
-            float _Radius;
-
-            v2f vert (FilterVertexInput v)
-            {
-                v2f o;
-                o.vertex = UnityObjectToClipPos(v.vertex);
-                o.uv = TRANSFORM_TEX(v.uv, _MainTex);
-                o.rectIndex = GetFilterRectIndex(v);
-                return o;
-            }
-
-            float2 NormalizeUVs(float2 uv, float4 uvRect)
-            {
-                // Normalize UV coordinates based on the atlas rect
-                return float2(
-                    (uv.x - uvRect.x) / uvRect.z,
-                    (uv.y - uvRect.y) / uvRect.w
-                );
-            }
-
-            float2 MapToUVRect(float2 uv, float4 uvRect)
-            {
-                // Map UV coordinates to the atlas rect
-                return float2(
-                    uv.x * uvRect.z + uvRect.x,
-                    uv.y * uvRect.w + uvRect.y
-                );
-            }
-
-            fixed4 frag (v2f i) : SV_Target
-            {
-                float effectRadius = _Radius;
-                float effectAngle = _Angle;
-
-                float4 uvRect = GetFilterUVRect(i.rectIndex);
-
-                float2 uv = NormalizeUVs(i.uv, uvRect);
-                float2 center = float2(0.5, 0.5);
-                uv = uv - center;
-
-                float len = length(uv * float2(_MainTex_TexelSize.z * _MainTex_TexelSize.y, 1.));
-                float angle = atan2(uv.y, uv.x) + effectAngle * smoothstep(effectRadius, 0., len);
-                float radius = length(uv);
-
-                uv = radius * float2(cos(angle), sin(angle)) + center;
-                uv = MapToUVRect(uv, uvRect);
-
-                return tex2D(_MainTex, uv);
-            }
-            ENDCG
-        }
-    }
+Shader "Unlit/Swirl"
+{
+    Properties
+    {
+        _MainTex ("Texture", 2D) = "white" {}
+    }
+    SubShader
+    {
+        Tags { "RenderType"="Opaque" }
+        Blend One Zero
+        ZWrite Off
+        ZTest Always
+        Cull Off
+
+        Pass
+        {
+            CGPROGRAM
+            #pragma vertex vert
+            #pragma fragment frag
+            #pragma multi_compile _ _UIE_OUTPUT_LINEAR
+
+            #include "UnityCG.cginc"
+            #include "UnityUIEFilter.cginc"
+
+            struct v2f
+            {
+                float4 vertex : SV_POSITION;
+                float2 uv : TEXCOORD0;
+                uint rectIndex : TEXCOORD1;
+            };
+
+            sampler2D _MainTex;
+            float4 _MainTex_ST;
+            float4 _MainTex_TexelSize;
+
+            float _Angle;
+            float _Radius;
+
+            v2f vert (FilterVertexInput v)
+            {
+                v2f o;
+                o.vertex = UnityObjectToClipPos(v.vertex);
+                o.uv = TRANSFORM_TEX(v.uv, _MainTex);
+                o.rectIndex = GetFilterRectIndex(v);
+                return o;
+            }
+
+            float2 NormalizeUVs(float2 uv, float4 uvRect)
+            {
+                // Normalize UV coordinates based on the atlas rect
+                return float2(
+                    (uv.x - uvRect.x) / uvRect.z,
+                    (uv.y - uvRect.y) / uvRect.w
+                );
+            }
+
+            float2 MapToUVRect(float2 uv, float4 uvRect)
+            {
+                // Map UV coordinates to the atlas rect
+                return float2(
+                    uv.x * uvRect.z + uvRect.x,
+                    uv.y * uvRect.w + uvRect.y
+                );
+            }
+
+            fixed4 frag (v2f i) : SV_Target
+            {
+                float effectRadius = _Radius;
+                float effectAngle = _Angle;
+
+                float4 uvRect = GetFilterUVRect(i.rectIndex);
+
+                float2 uv = NormalizeUVs(i.uv, uvRect);
+                float2 center = float2(0.5, 0.5);
+                uv = uv - center;
+
+                float len = length(uv * float2(_MainTex_TexelSize.z * _MainTex_TexelSize.y, 1.));
+                float angle = atan2(uv.y, uv.x) + effectAngle * smoothstep(effectRadius, 0., len);
+                float radius = length(uv);
+
+                uv = radius * float2(cos(angle), sin(angle)) + center;
+                uv = MapToUVRect(uv, uvRect);
+
+                half4 col = tex2D(_MainTex, uv);
+
+                #if _UIE_OUTPUT_LINEAR
+                col.rgb = GammaToLinearSpace(col.rgb);
+                #endif
+
+                return col;
+            }
+            ENDCG
+        }
+    }
 }
\ No newline at end of file
diff --git a/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader.meta b/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader.meta
index 834e9a1..2ae5aec 100644
--- a/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader.meta
+++ b/create-a-custom-swirl-filter/SwirlFilter/Swirl.shader.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5dbb6a0cc7d83894dbc7350392d137af
+guid: a0086fb18538742a0b09fc35e29d48e7
 ShaderImporter:
   externalObjects: {}
   defaultTextures: []
diff --git a/create-a-custom-swirl-filter/SwirlFilter/SwirlFilterFunction.asset b/create-a-custom-swirl-filter/SwirlFilter/SwirlFilter.asset
similarity index 88%
rename from create-a-custom-swirl-filter/SwirlFilter/SwirlFilterFunction.asset
rename to create-a-custom-swirl-filter/SwirlFilter/SwirlFilter.asset
index e6d79b8..65b4b43 100644
--- a/create-a-custom-swirl-filter/SwirlFilter/SwirlFilterFunction.asset
+++ b/create-a-custom-swirl-filter/SwirlFilter/SwirlFilter.asset
@@ -10,9 +10,9 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 19107, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: SwirlFilterFunction
+  m_Name: SwirlFilter
   m_EditorClassIdentifier: UnityEngine.dll::UnityEngine.UIElements.FilterFunctionDefinition
-  m_FilterName: 
+  m_FilterName: swirl
   m_Parameters:
   - m_Name: angle
     m_InterpolationDefaultValue:
@@ -25,7 +25,7 @@ MonoBehaviour:
       m_FloatValue: 0
       m_ColorValue: {r: 0, g: 0, b: 0, a: 0}
   m_Passes:
-  - m_Material: {fileID: 2100000, guid: 19988972054669741a269d01b4c735aa, type: 2}
+  - m_Material: {fileID: 2100000, guid: 410b26533861d4ad5b736c33ea860dd0, type: 2}
     m_PassIndex: 0
     m_ParameterBindings:
     - m_Index: 0
diff --git a/create-a-custom-swirl-filter/SwirlFilter/SwirlFilterFunction.asset.meta b/create-a-custom-swirl-filter/SwirlFilter/SwirlFilter.asset.meta
similarity index 78%
rename from create-a-custom-swirl-filter/SwirlFilter/SwirlFilterFunction.asset.meta
rename to create-a-custom-swirl-filter/SwirlFilter/SwirlFilter.asset.meta
index 08ae484..a04c0eb 100644
--- a/create-a-custom-swirl-filter/SwirlFilter/SwirlFilterFunction.asset.meta
+++ b/create-a-custom-swirl-filter/SwirlFilter/SwirlFilter.asset.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4d0a7b05ec25eec47b5bb46be70e73da
+guid: 7e92ccbc1310e4502a26c33d9c6dcc22
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 0

From 2f09d601568e2798c27becc7dd4d3c12fb43e0c0 Mon Sep 17 00:00:00 2001
From: lilisha-unity <94024889+lilisha-unity@users.noreply.github.com>
Date: Tue, 20 Jan 2026 20:20:47 +0000
Subject: [PATCH 47/53] Added list view runtime binding example code.

---
 .../GameSwitchListAsset.asset                 | 23 +++++++++++++++
 .../GameSwitchListAsset.cs                    | 28 +++++++++++++++++++
 runtime-binding-listview/ListViewItem.uxml    | 14 ++++++++++
 runtime-binding-listview/UIListView.uxml      |  7 +++++
 4 files changed, 72 insertions(+)
 create mode 100644 runtime-binding-listview/GameSwitchListAsset.asset
 create mode 100644 runtime-binding-listview/GameSwitchListAsset.cs
 create mode 100644 runtime-binding-listview/ListViewItem.uxml
 create mode 100644 runtime-binding-listview/UIListView.uxml

diff --git a/runtime-binding-listview/GameSwitchListAsset.asset b/runtime-binding-listview/GameSwitchListAsset.asset
new file mode 100644
index 0000000..9b6fdf2
--- /dev/null
+++ b/runtime-binding-listview/GameSwitchListAsset.asset
@@ -0,0 +1,23 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9febeb0ff03ef41c1b57f385c9595122, type: 3}
+  m_Name: GameSwitchListAsset
+  m_EditorClassIdentifier: DocsExampleUIToolkit::GameSwitchListAsset
+  switches:
+  - enabled: 0
+    name: Use Local Server
+  - enabled: 0
+    name: Show Debug Menu
+  - enabled: 1
+    name: Show FPS Counter
+  - enabled: 1
+    name: Show FPS Counter
diff --git a/runtime-binding-listview/GameSwitchListAsset.cs b/runtime-binding-listview/GameSwitchListAsset.cs
new file mode 100644
index 0000000..8f25bdc
--- /dev/null
+++ b/runtime-binding-listview/GameSwitchListAsset.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using UnityEngine;
+  
+[CreateAssetMenu(fileName = "GameSwitchListAsset.asset", menuName = "GameSwitchListAsset")]
+public class GameSwitchListAsset : ScriptableObject
+{
+    public List<GameSwitch> switches = new();
+
+    public void Reset()
+    {
+        switches = new List<GameSwitch>{
+            new() { name = "Use Local Server", enabled = false },
+            new() { name = "Show Debug Menu", enabled = false },
+            new() { name = "Show FPS Counter", enabled = true },
+        };
+    }
+
+    public bool IsSwitchEnabled(string switchName) => switches.Find(s => s.name == switchName).enabled;
+
+    [Serializable]
+    public struct GameSwitch
+    {
+        public bool enabled;
+        public string name;
+    }
+}
diff --git a/runtime-binding-listview/ListViewItem.uxml b/runtime-binding-listview/ListViewItem.uxml
new file mode 100644
index 0000000..d3910e1
--- /dev/null
+++ b/runtime-binding-listview/ListViewItem.uxml
@@ -0,0 +1,14 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" editor-extension-mode="False">
+    <ui:VisualElement name="" style="flex-direction: row;">
+        <ui:Toggle>
+            <Bindings>
+                <ui:DataBinding property="value" data-source-path="enabled" binding-mode="TwoWay"/>
+            </Bindings>
+        </ui:Toggle>
+        <ui:TextField placeholder-text="filler text">
+            <Bindings>
+                <ui:DataBinding property="value" data-source-path="name" binding-mode="TwoWay"/>
+            </Bindings>
+        </ui:TextField>
+    </ui:VisualElement>
+</ui:UXML>
diff --git a/runtime-binding-listview/UIListView.uxml b/runtime-binding-listview/UIListView.uxml
new file mode 100644
index 0000000..3fc20d1
--- /dev/null
+++ b/runtime-binding-listview/UIListView.uxml
@@ -0,0 +1,7 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" editor-extension-mode="False">
+    <ui:ListView binding-source-selection-mode="AutoAssign" item-template="ListViewItem.uxml" data-source="GameSwitchListAsset.asset" show-foldout-header="true" virtualization-method="DynamicHeight" show-border="false" reorderable="true" horizontal-scrolling="false" selection-type="Single" reorder-mode="Animated" show-add-remove-footer="true">
+        <Bindings>
+            <ui:DataBinding property="itemsSource" data-source-path="switches"/>
+        </Bindings>
+    </ui:ListView>
+</ui:UXML>

From 93489c551ad3833461ed29dbe8df6a321da666eb Mon Sep 17 00:00:00 2001
From: lilisha-unity <94024889+lilisha-unity@users.noreply.github.com>
Date: Tue, 20 Jan 2026 21:24:45 +0000
Subject: [PATCH 48/53] Moved multiple properties binding example to master
 from 2023 branch.

---
 .../ExampleMultiPropertiesObject.cs           | 19 +++++++++++++++++++
 .../ExampleMultiPropertiesObject.uxml         | 14 ++++++++++++++
 .../MulPropertyObject.asset                   | 15 +++++++++++++++
 3 files changed, 48 insertions(+)
 create mode 100644 runtime-data-binding-multiple-properties/ExampleMultiPropertiesObject.cs
 create mode 100644 runtime-data-binding-multiple-properties/ExampleMultiPropertiesObject.uxml
 create mode 100644 runtime-data-binding-multiple-properties/MulPropertyObject.asset

diff --git a/runtime-data-binding-multiple-properties/ExampleMultiPropertiesObject.cs b/runtime-data-binding-multiple-properties/ExampleMultiPropertiesObject.cs
new file mode 100644
index 0000000..6f91a3f
--- /dev/null
+++ b/runtime-data-binding-multiple-properties/ExampleMultiPropertiesObject.cs
@@ -0,0 +1,19 @@
+using Unity.Properties;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+#if UNITY_EDITOR
+using UnityEditor;
+#endif
+
+[CreateAssetMenu]
+public class ExampleMultiPropertiesObject : ScriptableObject
+{
+    [Header("Bind to multiple properties")]
+
+    [CreateProperty]
+    public Vector3 vector3Value;
+    
+    [CreateProperty]
+    public float sumOfVector3Properties => vector3Value.x + vector3Value.y + vector3Value.z;
+}
\ No newline at end of file
diff --git a/runtime-data-binding-multiple-properties/ExampleMultiPropertiesObject.uxml b/runtime-data-binding-multiple-properties/ExampleMultiPropertiesObject.uxml
new file mode 100644
index 0000000..fa53fb2
--- /dev/null
+++ b/runtime-data-binding-multiple-properties/ExampleMultiPropertiesObject.uxml
@@ -0,0 +1,14 @@
+<engine:UXML xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:engine="UnityEngine.UIElements" xmlns:editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
+    <engine:VisualElement data-source="MulPropertyObject.asset" name="VisualElement" style="flex-grow: 1;">
+        <engine:Vector3Field label="Vec3 Field">
+            <Bindings>
+                <engine:DataBinding property="value" data-source-path="vector3Value" binding-mode="ToSource"/>
+            </Bindings>
+        </engine:Vector3Field>
+        <engine:FloatField label="Float Field" name="FloatField">
+            <Bindings>
+                <engine:DataBinding property="value" data-source-path="sumOfVector3Properties" binding-mode="ToTarget"/>
+            </Bindings>
+        </engine:FloatField>
+    </engine:VisualElement>
+</engine:UXML>
\ No newline at end of file
diff --git a/runtime-data-binding-multiple-properties/MulPropertyObject.asset b/runtime-data-binding-multiple-properties/MulPropertyObject.asset
new file mode 100644
index 0000000..7393f32
--- /dev/null
+++ b/runtime-data-binding-multiple-properties/MulPropertyObject.asset
@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 26a142acb91a04403a85f9cfd305e19b, type: 3}
+  m_Name: MulPropertyObject
+  m_EditorClassIdentifier: Assembly-CSharp::ExampleMultiPropertiesObject
+  vector3Value: {x: 3, y: 64, z: 45}

From 14472c1995f87353396f646fca6ea1739ecd3fbf Mon Sep 17 00:00:00 2001
From: lilisha-unity <94024889+lilisha-unity@users.noreply.github.com>
Date: Tue, 20 Jan 2026 21:33:38 +0000
Subject: [PATCH 49/53] Moved Get started runtime binding example code to
 master

---
 get-started-runtime-binding/ExampleObject.asset | 15 +++++++++++++++
 get-started-runtime-binding/ExampleObject.cs    | 15 +++++++++++++++
 get-started-runtime-binding/ExampleObject.uxml  |  8 ++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 get-started-runtime-binding/ExampleObject.asset
 create mode 100644 get-started-runtime-binding/ExampleObject.cs
 create mode 100644 get-started-runtime-binding/ExampleObject.uxml

diff --git a/get-started-runtime-binding/ExampleObject.asset b/get-started-runtime-binding/ExampleObject.asset
new file mode 100644
index 0000000..2430322
--- /dev/null
+++ b/get-started-runtime-binding/ExampleObject.asset
@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5061969b943f741da8662a4ef5c40cba, type: 3}
+  m_Name: ExampleObject
+  m_EditorClassIdentifier: DocsExampleUIToolkit::ExampleObject
+  simpleLabel: Hello World!
diff --git a/get-started-runtime-binding/ExampleObject.cs b/get-started-runtime-binding/ExampleObject.cs
new file mode 100644
index 0000000..96d9592
--- /dev/null
+++ b/get-started-runtime-binding/ExampleObject.cs
@@ -0,0 +1,15 @@
+using Unity.Properties;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+#if UNITY_EDITOR
+using UnityEditor;
+#endif
+
+[CreateAssetMenu]
+public class ExampleObject : ScriptableObject
+{
+    [Header("Simple binding")]
+    [CreateProperty]
+    public string simpleLabel = "Hello World!";
+}
\ No newline at end of file
diff --git a/get-started-runtime-binding/ExampleObject.uxml b/get-started-runtime-binding/ExampleObject.uxml
new file mode 100644
index 0000000..656f430
--- /dev/null
+++ b/get-started-runtime-binding/ExampleObject.uxml
@@ -0,0 +1,8 @@
+<engine:UXML xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:engine="UnityEngine.UIElements" 
+xmlns:editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
+    <engine:Label text="Label" data-source="ExampleObject.asset" data-source-path="simpleLabel">
+        <Bindings>
+            <engine:DataBinding property="text" binding-mode="ToTarget" />
+        </Bindings>
+    </engine:Label>
+</engine:UXML>

From d55b8aa7c3f33c09c2e53d8a5a5c3ee4afb9a28f Mon Sep 17 00:00:00 2001
From: lilisha-unity <94024889+lilisha-unity@users.noreply.github.com>
Date: Thu, 22 Jan 2026 18:23:24 +0000
Subject: [PATCH 50/53] Updated data binding code samples according to recent
 doc updates.

---
 bind-to-list/Editor/GameSwitchListEditor.cs   | 38 ++++++++++++-------
 .../Editor/game_switch_list_editor.uxml       | 10 -----
 bind-to-list/GameSwitch.cs                    |  8 ----
 bind-to-list/GameSwitchListAsset.cs           | 37 ++++++++++--------
 bind-to-list/game_switch.uxml                 | 12 +++---
 bind-to-list/game_switch_list_editor.uxml     |  4 ++
 .../Editor/GameSwitchesEditor.cs              | 30 ++++++++++-----
 .../Editor/game_switches_editor.uxml          |  6 ---
 bind-uxml-template/GameSwitch.cs              |  8 ----
 bind-uxml-template/GameSwitchesAsset.asset    | 23 +++++++++++
 bind-uxml-template/GameSwitchesAsset.cs       | 10 ++++-
 bind-uxml-template/game_switches_editor.uxml  |  6 +++
 12 files changed, 115 insertions(+), 77 deletions(-)
 delete mode 100644 bind-to-list/Editor/game_switch_list_editor.uxml
 delete mode 100644 bind-to-list/GameSwitch.cs
 create mode 100644 bind-to-list/game_switch_list_editor.uxml
 delete mode 100644 bind-uxml-template/Editor/game_switches_editor.uxml
 delete mode 100644 bind-uxml-template/GameSwitch.cs
 create mode 100644 bind-uxml-template/GameSwitchesAsset.asset
 create mode 100644 bind-uxml-template/game_switches_editor.uxml

diff --git a/bind-to-list/Editor/GameSwitchListEditor.cs b/bind-to-list/Editor/GameSwitchListEditor.cs
index 025f9cc..6bf197c 100644
--- a/bind-to-list/Editor/GameSwitchListEditor.cs
+++ b/bind-to-list/Editor/GameSwitchListEditor.cs
@@ -1,24 +1,36 @@
+using System.Collections.Generic;
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.UIElements;
+using UnityEditor.UIElements;
 
-namespace UIToolkitExamples
+public class ListViewBindingExample : EditorWindow
 {
-    [CustomEditor(typeof(GameSwitchListAsset))]
-    public class GameSwitchListEditor : Editor
+    [SerializeField]
+    private VisualTreeAsset m_VisualTreeAsset = default;
+
+    [SerializeField]
+    private GameSwitchListAsset gameSwitchList;
+
+    [MenuItem("UI Toolkit Examples/ListView SerializedObject Binding Example")]
+    public static void ShowExample()
     {
-        [SerializeField]
-        VisualTreeAsset m_ItemAsset;
+        ListViewBindingExample wnd = GetWindow<ListViewBindingExample>();
+        wnd.titleContent = new GUIContent("ListView Binding SerializedObject Example");
+    }
 
-        [SerializeField]
-        VisualTreeAsset m_EditorAsset;
+    public void CreateGUI()
+    {
+        VisualElement root = rootVisualElement;
+        m_VisualTreeAsset.CloneTree(root);
 
-        public override VisualElement CreateInspectorGUI()
+        var listView = root.Q<ListView>();
+        if (listView != null && gameSwitchList != null)
         {
-            var root = m_EditorAsset.CloneTree();
-            var listView = root.Q<ListView>();
-            listView.makeItem = m_ItemAsset.CloneTree;
-            return root;
+            // Set the items source.
+            listView.itemsSource = gameSwitchList.switches;
+            // Bind the ListView to the GameSwitchListAsset serialized object.
+            listView.Bind(new SerializedObject(gameSwitchList));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/bind-to-list/Editor/game_switch_list_editor.uxml b/bind-to-list/Editor/game_switch_list_editor.uxml
deleted file mode 100644
index d6aa61c..0000000
--- a/bind-to-list/Editor/game_switch_list_editor.uxml
+++ /dev/null
@@ -1,10 +0,0 @@
-<UXML xmlns="UnityEngine.UIElements" xmlns:ue="UnityEditor.UIElements">
-    <ListView virtualization-method="DynamicHeight"
-              reorder-mode="Animated"
-              binding-path="switches"
-              show-add-remove-footer="true"
-              show-border="true"
-              show-foldout-header="true"
-              header-title="Switches"
-    />
-</UXML>
\ No newline at end of file
diff --git a/bind-to-list/GameSwitch.cs b/bind-to-list/GameSwitch.cs
deleted file mode 100644
index dbbb2bf..0000000
--- a/bind-to-list/GameSwitch.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-
-[Serializable]
-public struct GameSwitch
-{
-    public string name;
-    public bool enabled;
-}
\ No newline at end of file
diff --git a/bind-to-list/GameSwitchListAsset.cs b/bind-to-list/GameSwitchListAsset.cs
index c8129cc..8f25bdc 100644
--- a/bind-to-list/GameSwitchListAsset.cs
+++ b/bind-to-list/GameSwitchListAsset.cs
@@ -1,23 +1,28 @@
+using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using UnityEngine;
-
-namespace UIToolkitExamples
+  
+[CreateAssetMenu(fileName = "GameSwitchListAsset.asset", menuName = "GameSwitchListAsset")]
+public class GameSwitchListAsset : ScriptableObject
 {
-    [CreateAssetMenu(menuName = "UIToolkitExamples/GameSwitchList")]
-    public class GameSwitchListAsset : ScriptableObject
+    public List<GameSwitch> switches = new();
+
+    public void Reset()
     {
-        public List<GameSwitch> switches;
+        switches = new List<GameSwitch>{
+            new() { name = "Use Local Server", enabled = false },
+            new() { name = "Show Debug Menu", enabled = false },
+            new() { name = "Show FPS Counter", enabled = true },
+        };
+    }
 
-        public void Reset()
-        {
-            switches = new()
-            {
-                new() { name = "Use Local Server", enabled = false },
-                new() { name = "Show Debug Menu", enabled = false },
-                new() { name = "Show FPS Counter", enabled = true },
-            };
-        }
+    public bool IsSwitchEnabled(string switchName) => switches.Find(s => s.name == switchName).enabled;
 
-        public bool IsSwitchEnabled(string switchName) => switches.Find(s => s.name == switchName).enabled;
+    [Serializable]
+    public struct GameSwitch
+    {
+        public bool enabled;
+        public string name;
     }
-}
\ No newline at end of file
+}
diff --git a/bind-to-list/game_switch.uxml b/bind-to-list/game_switch.uxml
index 06530f1..6e263f1 100644
--- a/bind-to-list/game_switch.uxml
+++ b/bind-to-list/game_switch.uxml
@@ -1,6 +1,6 @@
-<UXML xmlns="UnityEngine.UIElements" xmlns:ue="UnityEditor.UIElements">
-    <Box style="flex-direction: row;">
-        <Toggle binding-path="enabled" />
-        <TextField binding-path="name" readonly="true" style="flex-grow: 1;"/>
-    </Box>
-</UXML>
\ No newline at end of file
+<ui:UXML xmlns:ui="UnityEngine.UIElements" editor-extension-mode="False">
+    <ui:Box style="flex-direction: row;">
+        <ui:Toggle binding-path="enabled"/>
+        <ui:TextField binding-path="name" readonly="false" style="flex-grow: 1;"/>
+    </ui:Box>
+</ui:UXML>
diff --git a/bind-to-list/game_switch_list_editor.uxml b/bind-to-list/game_switch_list_editor.uxml
new file mode 100644
index 0000000..07d843b
--- /dev/null
+++ b/bind-to-list/game_switch_list_editor.uxml
@@ -0,0 +1,4 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" editor-extension-mode="False">
+    <ui:ListView virtualization-method="DynamicHeight" reorder-mode="Simple" binding-path="switches" show-add-remove-footer="true" show-foldout-header="true" header-title="" reorderable="true" item-template="game_switch.uxml" allow-add="true">
+    </ui:ListView>
+</ui:UXML>
diff --git a/bind-uxml-template/Editor/GameSwitchesEditor.cs b/bind-uxml-template/Editor/GameSwitchesEditor.cs
index 3c60315..7d40f3e 100644
--- a/bind-uxml-template/Editor/GameSwitchesEditor.cs
+++ b/bind-uxml-template/Editor/GameSwitchesEditor.cs
@@ -1,18 +1,30 @@
+using System.Collections.Generic;
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.UIElements;
+using UnityEditor.UIElements;
 
-namespace UIToolkitExamples
+public class UXMLTemplateBindingExample : EditorWindow
 {
-    [CustomEditor(typeof(GameSwitchesAsset))]
-    public class GameSwitchesEditor : Editor
+    [SerializeField]
+    private VisualTreeAsset m_VisualTreeAsset = default;
+
+    [SerializeField]
+    private GameSwitchesAsset gameSwitch;
+
+    [MenuItem("UI Toolkit Examples/UXML Template Binding Example")]
+    public static void ShowExample()
+    {
+        UXMLTemplateBindingExample wnd = GetWindow<UXMLTemplateBindingExample>();
+        wnd.titleContent = new GUIContent("UXML Template Binding Example");
+    }
+
+    public void CreateGUI()
     {
-        [SerializeField]
-        VisualTreeAsset visualTreeAsset;
+        VisualElement root = rootVisualElement;
+        m_VisualTreeAsset.CloneTree(root);
 
-        public override VisualElement CreateInspectorGUI()
-        {
-            return visualTreeAsset.CloneTree();
-        }
+        root.Bind(new SerializedObject(gameSwitch));
+       
     }
 }
\ No newline at end of file
diff --git a/bind-uxml-template/Editor/game_switches_editor.uxml b/bind-uxml-template/Editor/game_switches_editor.uxml
deleted file mode 100644
index b9571ac..0000000
--- a/bind-uxml-template/Editor/game_switches_editor.uxml
+++ /dev/null
@@ -1,6 +0,0 @@
-<UXML xmlns="UnityEngine.UIElements" xmlns:ue="UnityEditor.UIElements">
-    <Template name="switch" src="../game_switch.uxml"/>
-    <Instance template="switch" binding-path="useLocalServer" />
-    <Instance template="switch" binding-path="showDebugMenu" />
-    <Instance template="switch" binding-path="showFPSCounter" />
-</UXML>
diff --git a/bind-uxml-template/GameSwitch.cs b/bind-uxml-template/GameSwitch.cs
deleted file mode 100644
index dbbb2bf..0000000
--- a/bind-uxml-template/GameSwitch.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-
-[Serializable]
-public struct GameSwitch
-{
-    public string name;
-    public bool enabled;
-}
\ No newline at end of file
diff --git a/bind-uxml-template/GameSwitchesAsset.asset b/bind-uxml-template/GameSwitchesAsset.asset
new file mode 100644
index 0000000..ab8d092
--- /dev/null
+++ b/bind-uxml-template/GameSwitchesAsset.asset
@@ -0,0 +1,23 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ce160ca4f7e51491383abd6a96a574cd, type: 3}
+  m_Name: GameSwitchesAsset
+  m_EditorClassIdentifier: DocsExampleUIToolkit::GameSwitchesAsset
+  useLocalServer:
+    name: Use Local Server
+    enabled: 0
+  showDebugMenu:
+    name: Show Debug Menu
+    enabled: 0
+  showFPSCounter:
+    name: Show FPS Counter
+    enabled: 1
diff --git a/bind-uxml-template/GameSwitchesAsset.cs b/bind-uxml-template/GameSwitchesAsset.cs
index f600ee8..8e8d848 100644
--- a/bind-uxml-template/GameSwitchesAsset.cs
+++ b/bind-uxml-template/GameSwitchesAsset.cs
@@ -1,6 +1,7 @@
+using System;
 using UnityEngine;
 
-[CreateAssetMenu(menuName = "UIToolkitExamples/GameSwitches")]
+[CreateAssetMenu(fileName = "GameSwitchAsset.asset", menuName = "GameSwitchAsset")]
 public class GameSwitchesAsset : ScriptableObject
 {
     public GameSwitch useLocalServer;
@@ -14,4 +15,11 @@ public void Reset()
         showDebugMenu = new GameSwitch() { name = "Show Debug Menu", enabled = false };
         showFPSCounter = new GameSwitch() { name = "Show FPS Counter", enabled = true };
     }
+
+    [Serializable]
+    public struct GameSwitch
+    {
+        public string name;
+        public bool enabled;
+    }
 }
diff --git a/bind-uxml-template/game_switches_editor.uxml b/bind-uxml-template/game_switches_editor.uxml
new file mode 100644
index 0000000..9d4ea37
--- /dev/null
+++ b/bind-uxml-template/game_switches_editor.uxml
@@ -0,0 +1,6 @@
+<UXML xmlns="UnityEngine.UIElements" xmlns:ue="UnityEditor.UIElements" editor-extension-mode="False">
+    <Template name="switch" src="game_switch.uxml?"/>
+    <Instance template="switch" binding-path="useLocalServer"/>
+    <Instance template="switch" binding-path="showDebugMenu"/>
+    <Instance template="switch" binding-path="showFPSCounter"/>
+</UXML>

From 4ca3d8d447520cfabc8fb5ae7a0fd17ffbd1d72a Mon Sep 17 00:00:00 2001
From: lisha-li <lisha.li@unity3d.com>
Date: Wed, 28 Jan 2026 09:57:47 -0800
Subject: [PATCH 51/53] Added code sample for Inventory property drawer

---
 .../Scripts/AmmoConverter.cs                  |  22 +++
 .../Scripts/AmmoPropertyDrawer.cs             |  38 +++++
 .../Scripts/Character.cs                      |   8 ++
 .../Scripts/HealthPack.cs                     |  40 ++++++
 .../Scripts/Inventory.cs                      |  29 ++++
 .../Scripts/InventoryPropertyDrawer.cs        | 130 ++++++++++++++++++
 inventory-property-drawers/Scripts/Item.cs    |  15 ++
 inventory-property-drawers/UI/Sniper.uxml     |  13 ++
 8 files changed, 295 insertions(+)
 create mode 100644 inventory-property-drawers/Scripts/AmmoConverter.cs
 create mode 100644 inventory-property-drawers/Scripts/AmmoPropertyDrawer.cs
 create mode 100644 inventory-property-drawers/Scripts/Character.cs
 create mode 100644 inventory-property-drawers/Scripts/HealthPack.cs
 create mode 100644 inventory-property-drawers/Scripts/Inventory.cs
 create mode 100644 inventory-property-drawers/Scripts/InventoryPropertyDrawer.cs
 create mode 100644 inventory-property-drawers/Scripts/Item.cs
 create mode 100644 inventory-property-drawers/UI/Sniper.uxml

diff --git a/inventory-property-drawers/Scripts/AmmoConverter.cs b/inventory-property-drawers/Scripts/AmmoConverter.cs
new file mode 100644
index 0000000..f326d2c
--- /dev/null
+++ b/inventory-property-drawers/Scripts/AmmoConverter.cs
@@ -0,0 +1,22 @@
+using UnityEditor.UIElements;
+
+public class AmmoConverter : UxmlAttributeConverter<Ammo>
+{
+    public override Ammo FromString(string value)
+    {
+        var ammo = new Ammo();
+        var values = value.Split('/');
+        if (values.Length == 2)
+        {
+            int.TryParse(values[0], out ammo.count);
+            int.TryParse(values[1], out ammo.maxCount);
+        }
+        return ammo;
+    }
+
+    public override string ToString(Ammo value)
+    {
+        return $"{value.count}/{value.maxCount}";
+    }
+}
+
diff --git a/inventory-property-drawers/Scripts/AmmoPropertyDrawer.cs b/inventory-property-drawers/Scripts/AmmoPropertyDrawer.cs
new file mode 100644
index 0000000..8d9e13e
--- /dev/null
+++ b/inventory-property-drawers/Scripts/AmmoPropertyDrawer.cs
@@ -0,0 +1,38 @@
+// Note that this example creates a PropertyDrawer for the Ammo type because it's not a UxmlObject.
+using UnityEditor;
+using UnityEditor.UIElements;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+[CustomPropertyDrawer(typeof(Ammo))]
+public class AmmoPropertyDrawer : PropertyDrawer
+{
+    public override VisualElement CreatePropertyGUI(SerializedProperty property)
+    {
+        var root = new VisualElement { style = { flexDirection = FlexDirection.Row } };
+
+        var count = property.FindPropertyRelative("count");
+        var maxCount = property.FindPropertyRelative("maxCount");
+
+        var ammoField = new IntegerField("Ammo") { isDelayed = true, bindingPath = count.propertyPath };
+        ammoField.TrackPropertyValue(count, p =>
+        {
+            count.intValue = Mathf.Min(p.intValue, maxCount.intValue);
+            property.serializedObject.ApplyModifiedProperties();
+        });
+        root.Add(ammoField);
+        root.Add(new Label("/"));
+
+        var countField = new IntegerField { isDelayed = true, bindingPath = maxCount.propertyPath };
+        countField.TrackPropertyValue(maxCount, p =>
+        {
+            count.intValue = Mathf.Min(p.intValue, count.intValue);
+            property.serializedObject.ApplyModifiedProperties();
+        });
+        root.Add(countField);
+
+        root.Bind(property.serializedObject);
+
+        return root;
+    }
+}
\ No newline at end of file
diff --git a/inventory-property-drawers/Scripts/Character.cs b/inventory-property-drawers/Scripts/Character.cs
new file mode 100644
index 0000000..29ca722
--- /dev/null
+++ b/inventory-property-drawers/Scripts/Character.cs
@@ -0,0 +1,8 @@
+using UnityEngine.UIElements;
+
+[UxmlElement]
+public partial class Character : VisualElement
+{
+    [UxmlObjectReference("inventory")]
+    public Inventory Inventory { get; set; } = new Inventory();
+}
diff --git a/inventory-property-drawers/Scripts/HealthPack.cs b/inventory-property-drawers/Scripts/HealthPack.cs
new file mode 100644
index 0000000..351a8e4
--- /dev/null
+++ b/inventory-property-drawers/Scripts/HealthPack.cs
@@ -0,0 +1,40 @@
+using System;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+[UxmlObject]
+public partial class HealthPack : Item
+{
+    [UxmlAttribute]
+    public float healAmount = 100;
+
+    public HealthPack()
+    {
+        name = "Health Pack";
+    }
+}
+
+[UxmlObject]
+public partial class Sword : Item
+{
+    [UxmlAttribute, Range(1, 100)]
+    public float slashDamage;
+}
+
+[Serializable]
+public class Ammo
+{
+    public int count;
+    public int maxCount;
+}
+
+[UxmlObject]
+public partial class Gun : Item
+{
+    [UxmlAttribute]
+    public float damage;
+
+    [UxmlAttribute]
+    public Ammo ammo = new Ammo { count = 10, maxCount = 10 };
+}
+
diff --git a/inventory-property-drawers/Scripts/Inventory.cs b/inventory-property-drawers/Scripts/Inventory.cs
new file mode 100644
index 0000000..4894701
--- /dev/null
+++ b/inventory-property-drawers/Scripts/Inventory.cs
@@ -0,0 +1,29 @@
+using System.Collections.Generic;
+using UnityEngine.UIElements;
+
+[UxmlObject]
+public partial class Inventory
+{
+    List<Item> m_Items = new List<Item>();
+    Dictionary<int, Item> m_ItemDictionary = new Dictionary<int, Item>();
+
+    [UxmlAttribute]
+    int nextItemId = 1;
+
+    [UxmlObjectReference("Items")]
+    public List<Item> items
+    {
+        get => m_Items;
+        set
+        {
+            m_Items = value;
+            m_ItemDictionary.Clear();
+            foreach (var item in m_Items)
+            {
+                m_ItemDictionary[item.id] = item;
+            }
+        }
+    }
+
+    public Item GetItem(int id) => m_ItemDictionary.TryGetValue(id, out var item) ? item : null;
+}
\ No newline at end of file
diff --git a/inventory-property-drawers/Scripts/InventoryPropertyDrawer.cs b/inventory-property-drawers/Scripts/InventoryPropertyDrawer.cs
new file mode 100644
index 0000000..49f35a5
--- /dev/null
+++ b/inventory-property-drawers/Scripts/InventoryPropertyDrawer.cs
@@ -0,0 +1,130 @@
+// When you add a UxmlObject to the inventory list, include an instance of UxmlSerializedData, not an Item. 
+// To simplify this process, this example uses `UxmlSerializedDataCreator.CreateUxmlSerializedData`, 
+// a utility method that creates a UxmlObject’s UxmlSerializedData with default values.
+//
+// In this approach, the assignment of an ID value is introduced. To manage this, the last used ID value is stored 
+// within the element as a hidden field labeled `nextItemId`. Additionally, buttons are incorporated to add preconfigured 
+// sets of items. For instance, a Soldier might receive a Rifle, Machete, and Performance Pack.
+using UnityEditor;
+using UnityEngine.UIElements;
+using UnityEngine;
+using UnityEditor.UIElements;
+
+[CustomPropertyDrawer(typeof(Inventory.UxmlSerializedData))]
+public class InventoryPropertyDrawer : PropertyDrawer
+{
+    SerializedProperty m_InventoryProperty;
+    SerializedProperty m_ItemsProperty;
+
+    public override VisualElement CreatePropertyGUI(SerializedProperty property)
+    {
+        m_InventoryProperty = property;
+
+        var root = new VisualElement();
+
+        m_ItemsProperty = property.FindPropertyRelative("items");
+        var items = new ListView
+        {
+            showAddRemoveFooter = true,
+            showBorder = true,
+            showFoldoutHeader = false,
+            reorderable = true,
+            virtualizationMethod = CollectionVirtualizationMethod.DynamicHeight,
+            reorderMode = ListViewReorderMode.Animated,
+            bindingPath = m_ItemsProperty.propertyPath,
+            overridingAddButtonBehavior = OnAddItem
+        };
+        root.Add(items);
+
+        var addSniperGear = new Button(() =>
+        {
+            AddGun("Rifle", 4.5f, 33, 30, 30);
+            AddSword("Knife", 0.5f, 7);
+            AddHealthPack();
+            m_InventoryProperty.serializedObject.ApplyModifiedProperties();
+        });
+        addSniperGear.text = "Add Sniper Gear";
+
+        var addWarriorGear = new Button(() =>
+        {
+            AddGun("Rifle", 4.5f, 33, 30, 30);
+            AddHealthPack();
+            AddSword("Machete", 1, 11);
+            m_InventoryProperty.serializedObject.ApplyModifiedProperties();
+        });
+        addWarriorGear.text = "Add Warrior Gear";
+
+        var addMedicGear = new Button(() =>
+        {
+            AddGun("Pistol", 1.5f, 10, 15, 15);
+            AddHealthPack();
+            AddHealthPack();
+            AddHealthPack();
+            m_InventoryProperty.serializedObject.ApplyModifiedProperties();
+        });
+        addMedicGear.text = "Add Medic Gear";
+
+        root.Add(addSniperGear);
+        root.Add(addWarriorGear);
+        root.Add(addMedicGear);
+        root.Bind(property.serializedObject);
+        return root;
+    }
+
+    void AddGun(string name, float weight, float damage, int ammo, int maxAmmo)
+    {
+        m_ItemsProperty.arraySize++;
+        var newItem = m_ItemsProperty.GetArrayElementAtIndex(m_ItemsProperty.arraySize - 1);
+        newItem.managedReferenceValue = UxmlSerializedDataCreator.CreateUxmlSerializedData(typeof(Gun));
+        newItem.FindPropertyRelative("id").intValue = NextItemId();
+        newItem.FindPropertyRelative("name").stringValue = name;
+        newItem.FindPropertyRelative("weight").floatValue = weight;
+        newItem.FindPropertyRelative("damage").floatValue = damage;
+        var ammoInstance = newItem.FindPropertyRelative("ammo");
+        ammoInstance.FindPropertyRelative("count").intValue = ammo;
+        ammoInstance.FindPropertyRelative("maxCount").intValue = maxAmmo;
+    }
+
+    void AddSword(string name, float weight, float damage)
+    {
+        m_ItemsProperty.arraySize++;
+        var newItem = m_ItemsProperty.GetArrayElementAtIndex(m_ItemsProperty.arraySize - 1);
+        newItem.managedReferenceValue = UxmlSerializedDataCreator.CreateUxmlSerializedData(typeof(Sword));
+        newItem.FindPropertyRelative("id").intValue = NextItemId();
+        newItem.FindPropertyRelative("name").stringValue = name;
+        newItem.FindPropertyRelative("weight").floatValue = weight;
+        newItem.FindPropertyRelative("slashDamage").floatValue = damage;
+    }
+
+    void AddHealthPack()
+    {
+        m_ItemsProperty.arraySize++;
+        var newItem = m_ItemsProperty.GetArrayElementAtIndex(m_ItemsProperty.arraySize - 1);
+        newItem.managedReferenceValue = UxmlSerializedDataCreator.CreateUxmlSerializedData(typeof(HealthPack));
+        newItem.FindPropertyRelative("id").intValue = NextItemId();
+    }
+
+    int NextItemId() => m_InventoryProperty.FindPropertyRelative("nextItemId").intValue++;
+
+    void OnAddItem(BaseListView baseListView, Button button)
+    {
+        var menu = new GenericMenu();
+        var items = TypeCache.GetTypesDerivedFrom<Item>();
+        foreach (var item in items)
+        {
+            if (item.IsAbstract)
+                continue;
+
+            menu.AddItem(new GUIContent(item.Name), false, () =>
+            {
+                m_ItemsProperty.arraySize++;
+                var newItem = m_ItemsProperty.GetArrayElementAtIndex(m_ItemsProperty.arraySize - 1);
+                newItem.managedReferenceValue = UxmlSerializedDataCreator.CreateUxmlSerializedData(item);
+                newItem.FindPropertyRelative("id").intValue = NextItemId();
+                m_InventoryProperty.serializedObject.ApplyModifiedProperties();
+            });
+        }
+
+        menu.DropDown(button.worldBound);
+    }
+}
\ No newline at end of file
diff --git a/inventory-property-drawers/Scripts/Item.cs b/inventory-property-drawers/Scripts/Item.cs
new file mode 100644
index 0000000..109512d
--- /dev/null
+++ b/inventory-property-drawers/Scripts/Item.cs
@@ -0,0 +1,15 @@
+using UnityEngine.UIElements;
+using UnityEngine;
+
+[UxmlObject]
+public abstract partial class Item
+{
+    [UxmlAttribute, HideInInspector]
+    public int id;
+
+    [UxmlAttribute]
+    public string name;
+
+    [UxmlAttribute]
+    public float weight;
+}
diff --git a/inventory-property-drawers/UI/Sniper.uxml b/inventory-property-drawers/UI/Sniper.uxml
new file mode 100644
index 0000000..e51f57a
--- /dev/null
+++ b/inventory-property-drawers/UI/Sniper.uxml
@@ -0,0 +1,13 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
+    <Character name="Sniper">
+        <inventory>
+            <Inventory next-item-id="4">
+                <Items>
+                    <Gun id="1" name="Rifle" weight="4.5" damage="33" ammo="7/7" />
+                    <Sword id="2" name="Knife" weight="0.5" slash-damage="7" />
+                    <HealthPack id="3" />
+                </Items>
+            </Inventory>
+        </inventory>
+    </Character>
+</ui:UXML>
\ No newline at end of file

From 90e994d55565bee401b82795a5a0eb8eed1155e8 Mon Sep 17 00:00:00 2001
From: lilisha-unity <94024889+lilisha-unity@users.noreply.github.com>
Date: Tue, 7 Apr 2026 18:07:34 +0000
Subject: [PATCH 52/53] Bring files from branch 6000.5 to master

---
 pseudo-state-checker/ButtonAndToggle.uxml  |  4 ++
 pseudo-state-checker/PseudoStateChecker.cs | 69 ++++++++++++++++++++++
 2 files changed, 73 insertions(+)
 create mode 100644 pseudo-state-checker/ButtonAndToggle.uxml
 create mode 100644 pseudo-state-checker/PseudoStateChecker.cs

diff --git a/pseudo-state-checker/ButtonAndToggle.uxml b/pseudo-state-checker/ButtonAndToggle.uxml
new file mode 100644
index 0000000..09a52d5
--- /dev/null
+++ b/pseudo-state-checker/ButtonAndToggle.uxml
@@ -0,0 +1,4 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements">
+    <ui:Button text="Button" name="my-button"/>
+    <ui:Toggle label="Toggle" name="my-toggle"/>
+</ui:UXML>
diff --git a/pseudo-state-checker/PseudoStateChecker.cs b/pseudo-state-checker/PseudoStateChecker.cs
new file mode 100644
index 0000000..d011ec9
--- /dev/null
+++ b/pseudo-state-checker/PseudoStateChecker.cs
@@ -0,0 +1,69 @@
+using UnityEngine;
+using UnityEngine.UIElements;
+
+public class PseudoStateChecker : MonoBehaviour
+{
+    private Button myButton;
+    private Toggle myToggle;
+
+    void OnEnable()
+    {
+        GetComponent<PanelRenderer>().RegisterUIReloadCallback(OnUIReload);
+    }
+
+    void OnDisable()
+    {
+        GetComponent<PanelRenderer>().UnregisterUIReloadCallback(OnUIReload);
+    }
+
+    void OnUIReload(PanelRenderer renderer, VisualElement rootElement)
+    {
+        // Query for the elements. 
+        myButton = rootElement.Q<Button>("my-button");
+        myToggle = rootElement.Q<Toggle>("my-toggle");
+
+        if (myButton == null || myToggle == null)
+        {
+            Debug.LogError("Button or Toggle not found in the UI Document!");
+            return;
+        }
+
+        // Register callbacks to check states on a Button. 
+        myButton.RegisterCallback<PointerEnterEvent>(evt =>
+            Debug.Log($"Button PointerEnterEvent: hasHoverPseudoState = {myButton.hasHoverPseudoState}"));
+
+        myButton.RegisterCallback<PointerLeaveEvent>(evt =>
+            Debug.Log($"Button PointerLeaveEvent: hasHoverPseudoState = {myButton.hasHoverPseudoState}"));
+
+        // Use TrickleDown to ensure the callback receives the event before it is stopped by the Button.
+        myButton.RegisterCallback<PointerDownEvent>(
+            evt => Debug.Log($"Button PointerDownEvent: hasActivePseudoState = {myButton.hasActivePseudoState}"),
+            TrickleDown.TrickleDown);
+
+        myButton.RegisterCallback<PointerUpEvent>(evt =>
+            Debug.Log($"Button PointerUpEvent: hasActivePseudoState = {myButton.hasActivePseudoState}"));
+
+        myButton.RegisterCallback<FocusInEvent>(evt =>
+            Debug.Log($"Button FocusInEvent: hasFocusPseudoState = {myButton.hasFocusPseudoState}"));
+
+        myButton.RegisterCallback<FocusOutEvent>(evt =>
+            Debug.Log($"Button FocusOutEvent: hasFocusPseudoState = {myButton.hasFocusPseudoState}"));
+
+        // Register a callback to check the state on a Toggle. 
+        myToggle.RegisterValueChangedCallback(evt =>
+            Debug.Log($"Toggle ValueChangedEvent: hasCheckedPseudoState = {myToggle.hasCheckedPseudoState}"));
+
+        // Example of checking the disabled state.
+        // You can un-comment this to check the disabled state after 3 seconds.
+        // Invoke(nameof(DisableTheButton), 3f);
+    }
+
+    private void DisableTheButton()
+    {
+        if (myButton != null)
+        {
+            myButton.SetEnabled(false);
+            Debug.Log($"Button has been disabled: hasDisabledPseudoState = {myButton.hasDisabledPseudoState}");
+        }
+    }
+}

From 7ed6e7af9fc8a8f83facea818f47928d2e03a30f Mon Sep 17 00:00:00 2001
From: lisha-li <lisha.li@unity3d.com>
Date: Fri, 26 Jun 2026 13:54:47 -0700
Subject: [PATCH 53/53] Updated variable names

---
 create-a-custom-inspector/Car.cs              |  8 +++----
 .../Car_Inspector_UXML.uxml                   |  9 ++++----
 .../Editor/Car_Inspector.cs                   | 21 ++++++++++---------
 .../Editor/Tire_PropertyDrawer.cs             |  9 ++++----
 create-a-custom-inspector/Tire.cs             |  4 ++--
 5 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/create-a-custom-inspector/Car.cs b/create-a-custom-inspector/Car.cs
index 974097d..bde554e 100644
--- a/create-a-custom-inspector/Car.cs
+++ b/create-a-custom-inspector/Car.cs
@@ -2,10 +2,10 @@
 
 public class Car : MonoBehaviour
 {
-    public string m_Make = "Toyota";
-    public int m_YearBuilt = 1980;
-    public Color m_Color = Color.black;
+    public string make = "Toyota";
+    public int yearBuilt = 1980;
+    public Color color = Color.black;
 
     // This car has four tires.
-    public Tire[] m_Tires = new Tire[4];
+    public Tire[] tires = new Tire[4];
 }
\ No newline at end of file
diff --git a/create-a-custom-inspector/Car_Inspector_UXML.uxml b/create-a-custom-inspector/Car_Inspector_UXML.uxml
index 4251d73..11351f4 100644
--- a/create-a-custom-inspector/Car_Inspector_UXML.uxml
+++ b/create-a-custom-inspector/Car_Inspector_UXML.uxml
@@ -1,8 +1,7 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="True">
-    <ui:TextField picking-mode="Ignore" label="Make of the car" value="filler text" binding-path="m_Make" class="unity-base-field__aligned" />
-    <uie:PropertyField binding-path="m_YearBuilt" label="Year Built" class="unity-base-field__aligned" />
-    <uie:PropertyField binding-path="m_Color" label="Paint Color" class="unity-base-field__aligned" />
-    <uie:PropertyField label="Tire" binding-path="m_Tires" class="unity-base-field__aligned" />
-    <ui:Foldout text="Default Inspector" value="false" name="Default_Inspector" />
+    <ui:TextField picking-mode="Ignore" label="Make of the car" value="filler text" binding-path="make" class="unity-base-field__aligned" />
+    <uie:PropertyField binding-path="yearBuilt" label="Year Built" class="unity-base-field__aligned" />
+    <uie:PropertyField binding-path="color" label="Paint Color" class="unity-base-field__aligned" />
+    <uie:PropertyField label="Tires" binding-path="tires" class="unity-base-field__aligned" />
 </ui:UXML>
 
diff --git a/create-a-custom-inspector/Editor/Car_Inspector.cs b/create-a-custom-inspector/Editor/Car_Inspector.cs
index 448b8f1..1e41ae6 100644
--- a/create-a-custom-inspector/Editor/Car_Inspector.cs
+++ b/create-a-custom-inspector/Editor/Car_Inspector.cs
@@ -5,20 +5,21 @@
 [CustomEditor(typeof(Car))]
 public class Car_Inspector : Editor
 {
-    public VisualTreeAsset m_InspectorXML;
+    public VisualTreeAsset inspectorUXML;
     public override VisualElement CreateInspectorGUI()
     {
-        // Load the reference UXML.
-        m_InspectorXML= AssetDatabase.LoadAssetAtPath<VisualTreeAsset>("Assets/create-a-custom-inspector/Car_Inspector_UXML.uxml");
+         // Create a new VisualElement to be the root of our Inspector UI.
+        VisualElement myInspector = new VisualElement();
 
-        // Instantiate the UXML.
-        VisualElement myInspector = m_InspectorXML.Instantiate();
+        // Add a simple label.
+        myInspector.Add(new Label("This is a custom Inspector"));
 
-        // Get a reference to the default Inspector Foldout control.
-        VisualElement InspectorFoldout = myInspector.Q("Default_Inspector");
-
-        // Attach a default Inspector to the Foldout.
-        InspectorElement.FillDefaultInspector(InspectorFoldout, serializedObject, this);
+        // Load the UXML file and clone its tree into the inspector.
+        if (inspectorUXML != null)
+        {
+            VisualElement uxmlContent = inspectorUXML.CloneTree();
+            myInspector.Add(uxmlContent);
+        }
 
         // Return the finished Inspector UI.
         return myInspector;
diff --git a/create-a-custom-inspector/Editor/Tire_PropertyDrawer.cs b/create-a-custom-inspector/Editor/Tire_PropertyDrawer.cs
index 1e8e8b5..f1c6dbe 100644
--- a/create-a-custom-inspector/Editor/Tire_PropertyDrawer.cs
+++ b/create-a-custom-inspector/Editor/Tire_PropertyDrawer.cs
@@ -10,11 +10,10 @@ public override VisualElement CreatePropertyGUI(SerializedProperty property)
         // Create drawer UI using C#.
         var popup = new UnityEngine.UIElements.PopupWindow();
         popup.text = "Tire Details";
-        popup.Add(new PropertyField(property.FindPropertyRelative("m_AirPressure"), "Air Pressure (psi)"));
-        popup.Add(new PropertyField(property.FindPropertyRelative("m_ProfileDepth"), "Profile Depth (mm)"));
-        container.Add(popup);
+        popup.Add(new PropertyField(property.FindPropertyRelative("airPressure"), "Air Pressure (psi)"));
+        popup.Add(new PropertyField(property.FindPropertyRelative("profileDepth"), "Profile Depth (mm)"));
 
         // Return the finished UI.
-        return container;
+        return popup;
     }
-}
\ No newline at end of file
+}
diff --git a/create-a-custom-inspector/Tire.cs b/create-a-custom-inspector/Tire.cs
index 37dbd93..25f6b31 100644
--- a/create-a-custom-inspector/Tire.cs
+++ b/create-a-custom-inspector/Tire.cs
@@ -5,7 +5,7 @@
 [System.Serializable]
 public class Tire
 {
-    public float m_AirPressure = 21.5f;
-    public int m_ProfileDepth = 4;
+    public float airPressure = 21.5f;
+    public int profileDepth = 4;
 }