Make MouseEnterAndLeaveEventRouter responsible for wiring events

Author: jcansdale

src/GitHub.InlineReviews/InlineCommentMarginProvider.cs

@@ -65,15 +65,13 @@ IWpfTextViewMargin CreateMargin<TGlyphTag>(IGlyphFactory<TGlyphTag> glyphFactory
             return margin;
         }
 
-        void TrackCommentGlyphOnDiffView(IWpfTextViewHost host, FrameworkElement marginElement)
+        void TrackCommentGlyphOnDiffView(IWpfTextViewHost host, UIElement marginElement)
         {
             var textView = host.TextView;
             if (textView.Roles.Contains("DIFF"))
             {
-                var hostControl = host.HostControl;
                 var router = new MouseEnterAndLeaveEventRouter<AddInlineCommentGlyph>();
-                hostControl.MouseMove += (t, e) => router.MouseMove(marginElement, e);
-                hostControl.MouseLeave += (t, e) => router.MouseLeave(marginElement, e);
+                router.Add(host.HostControl, marginElement);
             }
         }
 

src/GitHub.InlineReviews/Tags/MouseEnterAndLeaveEventRouter.cs

@@ -9,7 +9,13 @@ class MouseEnterAndLeaveEventRouter<T> where T : FrameworkElement
     {
         T previousMouseOverElement;
 
-        public void MouseMove(object target, MouseEventArgs e)
+        public void Add(UIElement sourceElement, UIElement targetElement)
+        {
+            sourceElement.MouseMove += (t, e) => MouseMove(targetElement, e);
+            sourceElement.MouseLeave += (t, e) => MouseLeave(targetElement, e);
+        }
+
+        void MouseMove(object target, MouseEventArgs e)
         {
             T mouseOverElement = null;
             Action<T> visitAction = element =>
@@ -27,7 +33,7 @@ public void MouseMove(object target, MouseEventArgs e)
             }
         }
 
-        public void MouseLeave(object target, MouseEventArgs e)
+        void MouseLeave(object target, MouseEventArgs e)
         {
             MouseLeave(previousMouseOverElement, e);
         }