Add ProcessHandledEvents to IInputHandler

Author: miroiu

CHANGELOG.md

@@ -3,6 +3,7 @@
 #### **In development**
 
 > - Breaking Changes:
+>	- Added ProcessHandledEvents to IInputHandler and removed it from InputProcessor
 > - Features:
 >	- Added AsRef extension method to InputGesture to convert it to an InputGestureRef
 > - Bugfixes:

Examples/Nodify.Calculator/EditorView.xaml.cs

@@ -14,11 +14,12 @@ public class OperationsMenuHandler : InputElementState<NodifyEditor>
 
         public OperationsMenuHandler(NodifyEditor element) : base(element)
         {
+            ProcessHandledEvents = true;
         }
 
         protected override void OnMouseUp(MouseButtonEventArgs e)
         {
-            if (OpenGesture.Matches(e.Source, e))
+            if (!e.Handled && OpenGesture.Matches(e.Source, e))
             {
                 ViewModel.OpenAt(Element.MouseLocation);
             }
@@ -43,10 +44,6 @@ public EditorView()
         static EditorView()
         {
             InputProcessor.Shared<NodifyEditor>.RegisterHandlerFactory(editor => new OperationsMenuHandler(editor));
-
-            // Ensure the selecting handler is executed after the OperationsMenuHandler, otherwise left click events will not be received.
-            InputProcessor.Shared<NodifyEditor>.RemoveHandlerFactory<EditorState.Selecting>();
-            InputProcessor.Shared<NodifyEditor>.RegisterHandlerFactory(editor => new EditorState.Selecting(editor));
         }
 
         private void OnDropNode(object sender, DragEventArgs e)

Examples/Nodify.Calculator/MainWindow.xaml

@@ -51,6 +51,8 @@
                             Value="{Binding DataContext.CloseEditorCommand ,Source={StaticResource Proxy}}"/>
                     <Setter Property="CloseTabCommandParameter" 
                             Value="{Binding Id}"/>
+                    <Setter Property="ToolTip"
+                            Value="Double click to edit" />
                 </Style>
             </shared:TabControlEx.ItemContainerStyle>
         </shared:TabControlEx>

Nodify/Interactivity/IInputHandler.cs

@@ -25,5 +25,10 @@ public interface IInputHandler
         /// Toggled interactions usually involve two steps, and it is important to keep the input capture active until the interaction is completed.
         /// </remarks>
         bool RequiresInputCapture { get; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether events that have been handled should be processed too.
+        /// </summary>
+        bool ProcessHandledEvents { get; }
     }
 }

Nodify/Interactivity/InputElementState.cs

@@ -16,6 +16,7 @@ public abstract class InputElementState<TElement> : IInputHandler
         protected TElement Element { get; }
 
         public bool RequiresInputCapture { get; protected set; }
+        public bool ProcessHandledEvents { get; protected set; }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="InputElementState{TElement}"/> class.

Nodify/Interactivity/InputElementStateStack.cs

@@ -20,6 +20,8 @@ public partial class InputElementStateStack<TElement> : IInputHandler
 
         public bool RequiresInputCapture => State.RequiresInputCapture;
 
+        public bool ProcessHandledEvents => State.ProcessHandledEvents;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="InputElementStateStack{TElement}"/> class.
         /// </summary>

Nodify/Interactivity/InputProcessor.Shared.cs

@@ -17,6 +17,8 @@ public sealed class Shared<TElement> : InputProcessor, IInputHandler
         {
             private static readonly List<KeyValuePair<Type, Func<TElement, IInputHandler>>> _handlerFactories = new List<KeyValuePair<Type, Func<TElement, IInputHandler>>>();
 
+            bool IInputHandler.ProcessHandledEvents { get; }
+
             /// <summary>
             /// Initializes a new instance of the <see cref="Shared{TElement}"/> class for the specified UI element.
             /// </summary>
@@ -119,10 +121,7 @@ public static class InputProcessorExtensions
         public static void AddSharedHandlers<TElement>(this InputProcessor inputProcessor, TElement instance)
             where TElement : FrameworkElement
         {
-            inputProcessor.AddHandler(new InputProcessor.Shared<TElement>(instance)
-            {
-                ProcessHandledEvents = inputProcessor.ProcessHandledEvents
-            });
+            inputProcessor.AddHandler(new InputProcessor.Shared<TElement>(instance));
         }
     }
 }

Nodify/Interactivity/InputProcessor.cs

@@ -10,11 +10,6 @@ public partial class InputProcessor
     {
         private readonly List<IInputHandler> _handlers = new List<IInputHandler>();
 
-        /// <summary>
-        /// Gets or sets a value indicating whether events that have been handled should be processed.
-        /// </summary>
-        public bool ProcessHandledEvents { get; set; }
-
         /// <summary>
         /// Gets a value indicating whether the processor has ongoing interactions that require input capture to remain active.
         /// </summary>
@@ -52,24 +47,11 @@ public void ProcessEvent(InputEventArgs e)
         {
             RequiresInputCapture = false;
 
-            if (!ProcessHandledEvents)
-            {
-                for (int i = 0; i < _handlers.Count; i++)
-                {
-                    IInputHandler handler = _handlers[i];
-                    if (!e.Handled)
-                    {
-                        handler.HandleEvent(e);
-                    }
-
-                    RequiresInputCapture |= handler.RequiresInputCapture;
-                }
-            }
-            else
+            for (int i = 0; i < _handlers.Count; i++)
             {
-                for (int i = 0; i < _handlers.Count; i++)
+                IInputHandler handler = _handlers[i];
+                if (!e.Handled || handler.ProcessHandledEvents)
                 {
-                    IInputHandler handler = _handlers[i];
                     handler.HandleEvent(e);
                     RequiresInputCapture |= handler.RequiresInputCapture;
                 }