Skip to content

Commit 96508f6

Browse files
committed
Undo addition of suppress non-matching events feature since its not really needed.
1 parent 6780d58 commit 96508f6

File tree

1 file changed

+1
-31
lines changed

1 file changed

+1
-31
lines changed

Packages/com.unity.inputsystem/InputSystem/Actions/InputActionRebindingExtensions.cs

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1575,33 +1575,6 @@ public RebindingOperation WithMatchingEventsBeingSuppressed(bool value = true)
15751575
return this;
15761576
}
15771577

1578-
/// <summary>
1579-
/// Prevent all input events that have no input matching the rebind operation's configuration from reaching
1580-
/// its target <
1581-
/// </summary>
1582-
/// <param name="value">If true (default) suppression is enabled, if false suppression is disabled.</param>
1583-
/// <returns>The same RebindingOperation instance.</returns>
1584-
/// <remarks>
1585-
/// This is similar to <see cref="WithMatchingEventsBeingSuppressed"/> but determines how to treat
1586-
/// non-matching input events.
1587-
///
1588-
/// Use this setting to suppress any input coming from controls that do not match the rebind target type.
1589-
/// For example, if the rebinding process is timed and do not show UI while rebinding, it might be desirable
1590-
/// to suppress e.g. UI input binding actions from triggering while waiting for input to bind.
1591-
///
1592-
/// See <seealso cref="WithActionsBeingSuppressed"/> for how this configuration relates to suppressing
1593-
/// actions during rebind.
1594-
/// </remarks>
1595-
public RebindingOperation WithNonMatchingEventsBeingSuppressed(bool value = true)
1596-
{
1597-
ThrowIfRebindInProgress();
1598-
if (value)
1599-
m_Flags |= Flags.SuppressNonMatchingEvents;
1600-
else
1601-
m_Flags &= ~Flags.SuppressNonMatchingEvents;
1602-
return this;
1603-
}
1604-
16051578
/// <summary>
16061579
/// Set the control path that is matched against actuated controls.
16071580
/// </summary>
@@ -2492,8 +2465,6 @@ private unsafe void OnEvent(InputEventPtr eventPtr, InputDevice device)
24922465
// will skip further processing of the event.
24932466
if (suppressEvent && (m_Flags & Flags.SuppressMatchingEvents) != 0)
24942467
eventPtr.handled = true;
2495-
else if ((m_Flags & Flags.SuppressNonMatchingEvents) != 0)
2496-
eventPtr.handled = true;
24972468

24982469
if (haveChangedCandidates && !canceled)
24992470
{
@@ -2759,8 +2730,7 @@ private enum Flags
27592730
DontIgnoreNoisyControls = 1 << 6,
27602731
DontGeneralizePathOfSelectedControl = 1 << 7,
27612732
AddNewBinding = 1 << 8,
2762-
SuppressMatchingEvents = 1 << 9,
2763-
SuppressNonMatchingEvents = 1 << 10,
2733+
SuppressMatchingEvents = 1 << 9
27642734
}
27652735
}
27662736

0 commit comments

Comments
 (0)