Merge branch 'develop' into stable

Author: jfreire-unity

.yamato/config.metadata

@@ -34,16 +34,16 @@ platforms_win:
 platforms_nix:
   - name: mac
     type: Unity::VM::osx
-    image: package-ci/macos-12:default
+    image: package-ci/macos-13:default
     flavor: m1.mac
   - name: mac_standalone
     type: Unity::VM::osx
-    image: package-ci/macos-12:default
+    image: package-ci/macos-13:default
     flavor: m1.mac
     runtime: StandaloneOSX
   - name: mac_standalone_il2cpp
     type: Unity::VM::osx
-    image: package-ci/macos-12:default
+    image: package-ci/macos-13:default
     flavor: m1.mac
     runtime: StandaloneOSX
     scripting-backend: Il2Cpp

Assets/Samples/CustomComposite/CustomComposite.cs

@@ -1,3 +1,4 @@
+using System;
 using UnityEngine;
 using UnityEngine.InputSystem;
 using UnityEngine.InputSystem.Layouts;
@@ -6,6 +7,7 @@
 #if UNITY_EDITOR
 using UnityEditor;
 using UnityEngine.InputSystem.Editor;
+using UnityEngine.UIElements;
 #endif
 
 // Let's say we want to have a composite that takes an axis and uses
@@ -175,6 +177,30 @@ public override void OnGUI()
         target.scaleFactor = EditorGUILayout.Slider(m_ScaleFactorLabel, currentValue, 0, 2);
     }
 
+#if UNITY_2022_1_OR_NEWER
+    public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback)
+    {
+        var slider = new Slider(m_ScaleFactorLabel.text, 0, 2)
+        {
+            value = target.scaleFactor,
+            showInputField = true
+        };
+
+        // Note: For UIToolkit sliders, as of Feb 2022, we can't register for the mouse up event directly
+        // on the slider because an element inside the slider captures the event. The workaround is to
+        // register for the event on the slider container. This will be fixed in a future version of
+        // UIToolkit.
+        slider.Q("unity-drag-container").RegisterCallback<MouseUpEvent>(evt =>
+        {
+            target.scaleFactor = slider.value;
+            onChangedCallback?.Invoke();
+        });
+
+        root.Add(slider);
+    }
+
+#endif
+
     private GUIContent m_ScaleFactorLabel = new GUIContent("Scale Factor");
 }
 #endif

Assets/Samples/InGameHints/InGameHintsActions.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.5.1
+//     version 1.6.0
 //     from Assets/Samples/InGameHints/InGameHintsActions.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if

Assets/Samples/SimpleDemo/SimpleControls.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.5.1
+//     version 1.6.0
 //     from Assets/Samples/SimpleDemo/SimpleControls.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if