Fixed a problem with previous swap bindings preventing multiple swaps in a row

Author: ekcoh

Assets/Samples/RebindingUI/RebindActionUI.cs

@@ -256,23 +256,22 @@ public void ResetToDefault()
         /// <remarks>It is expected that the other control is of a compatible type.</remarks>
         /// <param name="other">The other instance to swap binding with.</param>
         /// <returns>true if successfully swapped, else false.</returns>
-        public void Swap(RebindActionUI other)
+        public void SwapBinding(RebindActionUI other)
         {
             if (this == other)
                 return; // Silently ignore any request to swap binding with itself
             if (ongoingRebind != null || other.ongoingRebind != null)
-                return; // Do not allow swapping with ongoing rebinding .
-
+                throw new Exception("Cannot swap bindings when interactive rebinding is ongoing");
             if (!ResolveActionAndBinding(out var action, out var bindingIndex))
                 throw new Exception("Failed to resolve action and binding index");
             if (!other.ResolveActionAndBinding(out var otherAction, out var otherBindingIndex))
                 throw new Exception("Failed to resolve action and binding index");
 
-            // Apply binding override to target binding
-            var path = action.bindings[bindingIndex].path;
-            var otherPath = otherAction.bindings[otherBindingIndex].path;
-            action.ApplyBindingOverride(bindingIndex, otherPath);
-            otherAction.ApplyBindingOverride(otherBindingIndex, path);
+            // Apply binding override to target binding based on swapped effective binding paths.
+            var effectivePath = action.bindings[bindingIndex].effectivePath;
+            var otherEffectivePath = otherAction.bindings[otherBindingIndex].effectivePath;
+            action.ApplyBindingOverride(bindingIndex, otherEffectivePath);
+            otherAction.ApplyBindingOverride(otherBindingIndex, effectivePath);
         }
 
         /// <summary>

Assets/Samples/RebindingUI/RebindingUISampleScene.unity

@@ -2524,7 +2524,7 @@ MonoBehaviour:
       - m_Target: {fileID: 1627715299}
         m_TargetAssemblyTypeName: UnityEngine.InputSystem.Samples.RebindUI.RebindActionUI,
           Unity.InputSystem.RebindingUI
-        m_MethodName: Swap
+        m_MethodName: SwapBinding
         m_Mode: 2
         m_Arguments:
           m_ObjectArgument: {fileID: 720160216}
@@ -4031,7 +4031,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1014357782
 RectTransform:
   m_ObjectHideFlags: 0
@@ -4084,9 +4084,9 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: In practice, you probably don't want to set up rebinding the sticks like
-    this on a gamepad scheme but rather have a "swap sticks" kind of toggle instead.
-    The stick bindings here are included mainly for demonstration purposes.
+  m_Text: "In practice, you probably don't want to set up rebinding the sticks like
+    this on a gamepad scheme but rather have a \"swap sticks\" kind of toggle instead.
+    \n\nHere we do both variants for demonstration purposes."
 --- !u!222 &1014357784
 CanvasRenderer:
   m_ObjectHideFlags: 0