Added ability to also reset all bindings

Author: ekcoh

Assets/Samples/RebindingUI/RebindActionUI.cs

@@ -101,6 +101,15 @@ public Text rebindInfo
             set => m_RebindInfo = value;
         }
 
+        /// <summary>
+        /// Optional button to manually cancel rebinding while waiting.
+        /// </summary>
+        public Button rebindCancelButton
+        {
+            get => m_RebindCancelButton;
+            set => m_RebindCancelButton = value;
+        }
+
         /// <summary>
         /// Optional UI that is activated when an interactive rebind is started and deactivated when the rebind
         /// is finished. This is normally used to display an overlay over the current UI while the system is
@@ -272,6 +281,10 @@ private void PerformInteractiveRebind(InputAction action, int bindingIndex, bool
 
             void CleanUp()
             {
+                // Restore monitoring cancel button clicks
+                if (m_RebindCancelButton != null)
+                    m_RebindCancelButton.onClick.RemoveListener(CancelRebind);
+
                 m_RebindOperation?.Dispose();
                 m_RebindOperation = null;
 
@@ -346,6 +359,12 @@ void CleanUp()
                 m_RebindText.text = text;
             }
 
+            // Optionally allow canceling rebind via a button if it applicable for the use-case
+            if (m_RebindCancelButton != null)
+            {
+                m_RebindCancelButton.onClick.AddListener(CancelRebind);
+            }
+
             // Update rebind overlay information, if we have one.
             if (m_RebindInfo != null)
             {
@@ -381,6 +400,11 @@ private void UpdateRebindInfo(double now)
             m_LastRemainingTimeoutSeconds = remainingTimeoutWholeSeconds;
         }
 
+        private void CancelRebind()
+        {
+            m_RebindOperation?.Cancel();
+        }
+
         protected void Update()
         {
             if (m_RebindInfo != null)
@@ -467,6 +491,10 @@ private static void OnActionChange(object obj, InputActionChange change)
         [SerializeField]
         private Text m_RebindInfo;
 
+        [Tooltip("Optional cancellation UI button for rebinding overlay.")]
+        [SerializeField]
+        private Button m_RebindCancelButton;
+
         [Tooltip("Event that is triggered when the way the binding is display should be updated. This allows displaying "
             + "bindings in custom ways, e.g. using images instead of text.")]
         [SerializeField]

Assets/Samples/RebindingUI/RebindActionUIEditor.cs

@@ -22,6 +22,7 @@ protected void OnEnable()
             m_RebindOverlayProperty = serializedObject.FindProperty("m_RebindOverlay");
             m_RebindTextProperty = serializedObject.FindProperty("m_RebindText");
             m_RebindInfoProperty = serializedObject.FindProperty("m_RebindInfo");
+            m_RebindCancelButtonProperty = serializedObject.FindProperty("m_RebindCancelButton");
             m_UpdateBindingUIEventProperty = serializedObject.FindProperty("m_UpdateBindingUIEvent");
             m_RebindStartEventProperty = serializedObject.FindProperty("m_RebindStartEvent");
             m_RebindStopEventProperty = serializedObject.FindProperty("m_RebindStopEvent");
@@ -64,6 +65,7 @@ public override void OnInspectorGUI()
                 EditorGUILayout.PropertyField(m_RebindOverlayProperty);
                 EditorGUILayout.PropertyField(m_RebindTextProperty);
                 EditorGUILayout.PropertyField(m_RebindInfoProperty);
+                EditorGUILayout.PropertyField(m_RebindCancelButtonProperty);
             }
 
             // Events section.
@@ -158,6 +160,7 @@ protected void RefreshBindingOptions()
         private SerializedProperty m_RebindOverlayProperty;
         private SerializedProperty m_RebindTextProperty;
         private SerializedProperty m_RebindInfoProperty;
+        private SerializedProperty m_RebindCancelButtonProperty;
         private SerializedProperty m_RebindStartEventProperty;
         private SerializedProperty m_RebindStopEventProperty;
         private SerializedProperty m_UpdateBindingUIEventProperty;