Modified handled evaluation in state monitors. Formatting.

Author: ekcoh

Assets/Tests/InputSystem/CoreTests_Events.cs

@@ -1256,7 +1256,7 @@ public void Events_ShouldRespectHandledPolicyUponUpdate(InputEventHandledPolicy
     {
         // Update setting to match desired scenario
         InputSystem.inputEventHandledPolicy = policy;
-        
+
         // Use a boxed boolean to allow lambda to capture reference.
         var data = new SuppressedActionEventData();
 

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

@@ -1544,7 +1544,7 @@ private void ProcessControlStateChange(int mapIndex, int controlIndex, int bindi
                         {
                             return;
                         }
-                        
+
                         // CALLBACK HERE
                         ProcessDefaultInteraction(ref trigger, actionIndex);
                     }
@@ -2504,7 +2504,7 @@ private void ChangePhaseOfActionInternal(int actionIndex, TriggerState* actionSt
 
             //if (InputSystem.inputEventHandledPolicy == InputEventHandledPolicy.SuppressNotifications)
             //    return;
-            
+
             // Let listeners know.
             var map = maps[trigger.mapIndex];
             Debug.Assert(actionIndex >= mapIndices[trigger.mapIndex].actionStartIndex,

Packages/com.unity.inputsystem/InputSystem/InputManager.cs

@@ -3477,7 +3477,7 @@ private unsafe void OnUpdate(InputUpdateType updateType, ref InputEventBuffer ev
                             new InputEventPtr(currentEventReadPtr), device, k_InputOnEventMarker, "InputSystem.onEvent");
 
                         // If a listener marks the event as handled, we don't process it further.
-                        if (m_InputEventHandledPolicy == InputEventHandledPolicy.SuppressProcessing && 
+                        if (m_InputEventHandledPolicy == InputEventHandledPolicy.SuppressProcessing &&
                             currentEventReadPtr->handled)
                         {
                             m_InputEventStream.Advance(false);

Packages/com.unity.inputsystem/InputSystem/InputManagerStateMonitors.cs

@@ -382,7 +382,7 @@ internal unsafe void FireStateChangeNotifications(int deviceIndex, double intern
 
             // Call IStateChangeMonitor.NotifyControlStateChange for every monitor that is in
             // signalled state.
-            eventPtr->handled = false;
+            var savedHandled = eventPtr->handled;
             for (var i = 0; i < signals.length; ++i)
             {
                 if (!signals.TestBit(i))
@@ -404,8 +404,9 @@ internal unsafe void FireStateChangeNotifications(int deviceIndex, double intern
 
                 // If the monitor signalled that it has processed the state change, reset all signalled
                 // state monitors in the same group. This is what causes "SHIFT+B" to prevent "B" from
-                // also triggering.
-                if (eventPtr->handled)
+                // also triggering. Note that we skip this if it was already marked handled before notifying
+                // monitors.
+                if (!savedHandled && eventPtr->handled)
                 {
                     var groupIndex = listeners[i].groupIndex;
                     for (var n = i + 1; n < signals.length; ++n)