Merge pull request #223 from miroiu/master

Merge master into release-v7.0.0

Author: miroiu

CHANGELOG.md

@@ -6,6 +6,35 @@
 > - Features:
 > - Bugfixes:
 
+#### **Version 7.0.4**
+
+> - Features:
+>	- Added AsRef extension method to InputGesture to convert it to an InputGestureRef
+> - Bugfixes:
+>	- Fixed an issue where the gesture used for EditorGestures.Editor.SelectAll extracted from the ApplicationCommands was assumed to be a KeyGesture
+>	- Fixed overrides of DrawDirectionalArrowheadGeometry virtual method not working in subclasses of the built in connections
+>	- Fixed a memory leak caused by the auto panning timer
+
+#### **Version 7.0.3**
+
+> - Bugfixes:
+>	- Fixed an issue where the SelectedEvent and UnselectedEvent events on the ItemContainer were not raised when the selection was completed
+
+#### **Version 7.0.2**
+
+> - Features:
+>	- Added EditorGestures.Editor.SelectAll 
+> - Bugfixes:
+>	- Fixed an issue where the EditorCommands.SelectAll gesture could not be customized
+
+#### **Version 7.0.1**
+
+> - Bugfixes:
+>	- Fixed an issue where connections would not gain focus when selected, which could prevent editor keybindings from functioning in certain scenarios
+>	- Resolved an issue where selecting a node did not deselect connections and vice versa
+>	- Fixed a bug preventing ItemContainers from being selected when the mouse could not be captured
+>	- Fixed an issue with key detection in Japanese IME environments, causing issues with the MouseGesture
+
 #### **Version 7.0.0**
 
 > - Breaking Changes:

Examples/Nodify.Calculator/EditorView.xaml.cs

@@ -1,42 +1,57 @@
-using System.Windows;
+using Nodify.Interactivity;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 
 namespace Nodify.Calculator
 {
-    public partial class EditorView : UserControl
+    public class OperationsMenuHandler : InputElementState<NodifyEditor>
     {
-        public EditorView()
-        {
-            InitializeComponent();
+        private static InputGesture OpenGesture { get; } = new Interactivity.MouseGesture(MouseAction.RightClick);
+        private static InputGesture CloseGesture { get; } = new Interactivity.MouseGesture(MouseAction.LeftClick);
+
+        private OperationsMenuViewModel ViewModel => ((CalculatorViewModel)Element.DataContext).OperationsMenu;
 
-            EventManager.RegisterClassHandler(typeof(NodifyEditor), MouseLeftButtonDownEvent, new MouseButtonEventHandler(CloseOperationsMenu), true);
-            EventManager.RegisterClassHandler(typeof(NodifyEditor), MouseRightButtonUpEvent, new MouseButtonEventHandler(OpenOperationsMenu));
+        public OperationsMenuHandler(NodifyEditor element) : base(element)
+        {
         }
 
-        private void OpenOperationsMenu(object sender, MouseButtonEventArgs e)
+        protected override void OnMouseUp(MouseButtonEventArgs e)
         {
-            if (e.OriginalSource is NodifyEditor editor && editor.DataContext is CalculatorViewModel calculator)
+            if (OpenGesture.Matches(e.Source, e))
             {
-                e.Handled = true;
-                calculator.OperationsMenu.OpenAt(editor.MouseLocation);
+                ViewModel.OpenAt(Element.MouseLocation);
             }
         }
 
-        private void CloseOperationsMenu(object sender, MouseButtonEventArgs e)
+        protected override void OnMouseDown(MouseButtonEventArgs e)
         {
-            ItemContainer? itemContainer = sender as ItemContainer;
-            NodifyEditor? editor = sender as NodifyEditor ?? itemContainer?.Editor;
-
-            if (editor?.DataContext is CalculatorViewModel calculator)
+            if (CloseGesture.Matches(e.Source, e))
             {
-                calculator.OperationsMenu.Close();
+                ViewModel.Close();
             }
         }
+    }
+
+    public partial class EditorView : UserControl
+    {
+        public EditorView()
+        {
+            InitializeComponent();
+        }
+
+        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)
         {
-            if(e.Source is NodifyEditor editor && editor.DataContext is CalculatorViewModel calculator
+            if (e.Source is NodifyEditor editor && editor.DataContext is CalculatorViewModel calculator
                 && e.Data.GetData(typeof(OperationInfoViewModel)) is OperationInfoViewModel operation)
             {
                 OperationViewModel op = OperationFactory.GetOperation(operation);
@@ -49,8 +64,8 @@ private void OnDropNode(object sender, DragEventArgs e)
 
         private void OnNodeDrag(object sender, MouseEventArgs e)
         {
-            if(e.LeftButton == MouseButtonState.Pressed && ((FrameworkElement)sender).DataContext is OperationInfoViewModel operation)
-            { 
+            if (e.LeftButton == MouseButtonState.Pressed && ((FrameworkElement)sender).DataContext is OperationInfoViewModel operation)
+            {
                 var data = new DataObject(typeof(OperationInfoViewModel), operation);
                 DragDrop.DoDragDrop(this, data, DragDropEffects.Copy);
             }

Examples/Nodify.Shapes/Canvas/Gestures/UnboundGestureMappings.cs

@@ -9,6 +9,7 @@ public class UnboundGestureMappings : EditorGestures
         public UnboundGestureMappings()
         {
             Editor.Selection.Unbind();
+            Editor.SelectAll.Unbind();
             ItemContainer.Selection.Unbind();
             Connection.Disconnect.Unbind();
             Connector.Connect.Unbind();

Nodify/Connections/CircuitConnection.cs

@@ -82,7 +82,7 @@ protected override void DrawDirectionalArrowsGeometry(StreamGeometryContext cont
                 var (segment, to) = InterpolateLine(p0, p1, p2, t);
 
                 var direction = segment.SegmentStart - segment.SegmentEnd;
-                base.DrawDirectionalArrowheadGeometry(context, direction, to);
+                DrawDirectionalArrowheadGeometry(context, direction, to);
             }
         }
 

Nodify/Connections/Connection.cs

@@ -42,7 +42,7 @@ protected override void DrawDirectionalArrowsGeometry(StreamGeometryContext cont
                 var to = InterpolateCubicBezier(p0, p1, p2, p3, t);
                 var direction = GetBezierTangent(p0, p1, p2, p3, t);
 
-                base.DrawDirectionalArrowheadGeometry(context, direction, to);
+                DrawDirectionalArrowheadGeometry(context, direction, to);
             }
         }
 

Nodify/Connections/ConnectionContainer.cs

@@ -75,6 +75,11 @@ public event RoutedEventHandler Unselected
 
         private SelectionType? _selectionType;
 
+        static ConnectionContainer()
+        {
+            FocusableProperty.OverrideMetadata(typeof(ConnectionContainer), new FrameworkPropertyMetadata(BoxValue.True));
+        }
+
         internal ConnectionContainer(ConnectionsMultiSelector selector)
         {
             Selector = selector;

Nodify/Connections/ConnectionsMultiSelector.cs

@@ -44,6 +44,11 @@ private bool CanSelectMultipleItemsBase
             set => base.CanSelectMultipleItems = value;
         }
 
+        /// <summary>
+        /// Gets the <see cref="NodifyEditor"/> that owns this <see cref="ConnectionsMultiSelector"/>.
+        /// </summary>
+        public NodifyEditor? Editor { get; private set; }
+
         protected override DependencyObject GetContainerForItemOverride()
             => new ConnectionContainer(this);
 
@@ -66,6 +71,15 @@ public void Select(ConnectionContainer container)
 #endif
 
             EndUpdateSelectedItems();
+
+            Editor?.UnselectAll();
+        }
+
+        public override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+
+            Editor = this.GetParentOfType<NodifyEditor>();
         }
 
         #region Selection Handlers

Nodify/Connections/LineConnection.cs

@@ -83,7 +83,7 @@ protected override void DrawDirectionalArrowsGeometry(StreamGeometryContext cont
                 double t = (spacing * i + DirectionalArrowsOffset).WrapToRange(0d, 1d);
                 var to = InterpolateLineSegment(p0, p1, t);
 
-                base.DrawDirectionalArrowheadGeometry(context, direction, to);
+                DrawDirectionalArrowheadGeometry(context, direction, to);
             }
         }
 

Nodify/Connections/StepConnection.cs

@@ -163,7 +163,7 @@ protected override void DrawDirectionalArrowsGeometry(StreamGeometryContext cont
                 var (segment, to) = InterpolateLine(p0, p1, p2, p3, t);
 
                 var direction = segment.SegmentStart - segment.SegmentEnd;
-                base.DrawDirectionalArrowheadGeometry(context, direction, to);
+                DrawDirectionalArrowheadGeometry(context, direction, to);
             }
         }
 

Nodify/Connectors/Connector.cs

@@ -172,6 +172,9 @@ static Connector()
         public Connector()
         {
             InputProcessor.AddSharedHandlers(this);
+
+            Loaded += OnConnectorLoaded;
+            Unloaded += OnConnectorUnloaded;
         }
 
         /// <inheritdoc />
@@ -181,9 +184,6 @@ public override void OnApplyTemplate()
 
             Container = this.GetParentOfType<ItemContainer>();
             Editor = Container?.Editor ?? this.GetParentOfType<NodifyEditor>();
-
-            Loaded += OnConnectorLoaded;
-            Unloaded += OnConnectorUnloaded;
         }
 
         #region Update Anchor