Removed dead MouseEvent.OfX/OfY code

Terminal.Gui/Views/Menu/MenuBar.cs

@@ -1647,7 +1647,7 @@ public class MenuBar : View
     }
 
     /// <inheritdoc/>
-    protected internal override bool OnMouseEvent  (MouseEvent me)
+    protected internal override bool OnMouseEvent (MouseEvent me)
     {
         if (!_handled && !HandleGrabView (me, this))
         {
@@ -1779,35 +1779,35 @@ public class MenuBar : View
                     }
                 }
 
-                if (me.View != current)
-                {
-                    Application.UngrabMouse ();
-                    View v = me.View;
-                    Application.GrabMouse (v);
-                    MouseEvent nme;
-
-                    if (me.Y > -1)
-                    {
-                        Point newxy = v.ScreenToFrame (me.X, me.Y);
-
-                        nme = new MouseEvent
-                        {
-                            X = newxy.X,
-                            Y = newxy.Y,
-                            Flags = me.Flags,
-                            ScreenX = me.X - newxy.X,
-                            ScreenY = me.Y - newxy.Y,
-                            View = v
-                        };
-                    }
-                    else
-                    {
-                        nme = new MouseEvent { X = me.X + current.Frame.X, Y = 0, Flags = me.Flags, View = v };
-                    }
-                    v.OnMouseEvent (nme);
-
-                    return false;
-                }
+                // TODO: This is dead code. It is not clear what it is trying to do, and it never gets hit.
+                //if (me.View != current)
+                //{
+                //    Application.UngrabMouse ();
+                //    View v = me.View;
+                //    Application.GrabMouse (v);
+                //    MouseEvent nme;
+
+                //    if (me.Y > -1)
+                //    {
+                //        Point newxy = v.ScreenToFrame (me.X, me.Y);
+
+                //        nme = new MouseEvent
+                //        {
+                //            X = newxy.X,
+                //            Y = newxy.Y,
+                //            Flags = me.Flags,
+                //            ScreenX = me.X - newxy.X,
+                //            ScreenY = me.Y - newxy.Y,
+                //            View = v
+                //        };
+                //    }
+                //    else
+                //    {
+                //        nme = new MouseEvent { X = me.X + current.Frame.X, Y = 0, Flags = me.Flags, View = v };
+                //    }
+                //    v.OnMouseEvent (nme);
+                //    return false;
+                //}
             }
             else if (!_isContextMenuLoading
                      && !(me.View is MenuBar || me.View is Menu)
@@ -1841,11 +1841,11 @@ public class MenuBar : View
                                           MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition
                                          )))
         {
-           Application.GrabMouse (current);
+            Application.GrabMouse (current);
         }
         else if (IsMenuOpen && (me.View is MenuBar || me.View is Menu))
         {
-           Application.GrabMouse (me.View);
+            Application.GrabMouse (me.View);
         }
         else
         {

Terminal.Gui/Views/TextField.cs

@@ -1767,20 +1767,7 @@ public class TextField : View
 
     private int PositionCursor (MouseEvent ev)
     {
-        // We could also set the cursor position.
-        int x;
-        int pX = TextModel.GetColFromX (_text, ScrollOffset, ev.X);
-
-        if (_text.Count == 0)
-        {
-            x = pX - ev.ScreenX;
-        }
-        else
-        {
-            x = pX;
-        }
-
-        return PositionCursor (x, false);
+        return PositionCursor (TextModel.GetColFromX (_text, ScrollOffset, ev.X), false);
     }
 
     private int PositionCursor (int x, bool getX = true)