From fb7f8a72655cc1340edfcfd9323a4c294507add4 Mon Sep 17 00:00:00 2001
From: Charlie Kindel <tig@users.noreply.github.com>
Date: Wed, 2 Nov 2022 15:41:29 -0600
Subject: [PATCH] manual update of branch

---
 Terminal.Gui/Core/View.cs      | 13 +++++++++----
 Terminal.Gui/Views/ComboBox.cs |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Terminal.Gui/Core/View.cs b/Terminal.Gui/Core/View.cs
index 0fcd73b07..f59de33ee 100644
--- a/Terminal.Gui/Core/View.cs
+++ b/Terminal.Gui/Core/View.cs
@@ -3082,10 +3082,15 @@ namespace Terminal.Gui {
 		/// <returns><see langword="true"/> if it's overridden, <see langword="false"/> otherwise.</returns>
 		public bool IsOverridden (View view, string method)
 		{
-			Type t = view.GetType ();
-			MethodInfo m = t.GetMethod (method);
-
-			return (m.DeclaringType == t || m.ReflectedType == t) && m.GetBaseDefinition ().DeclaringType == typeof (Responder);
+			MethodInfo m = view.GetType ().GetMethod (method,
+				BindingFlags.Instance
+				| BindingFlags.Public
+				| BindingFlags.NonPublic
+				| BindingFlags.DeclaredOnly);
+			if (m == null) {
+				return false;
+			}
+			return m.GetBaseDefinition ().DeclaringType != m.DeclaringType;
 		}
 	}
 }
diff --git a/Terminal.Gui/Views/ComboBox.cs b/Terminal.Gui/Views/ComboBox.cs
index c26a340ed..173dc188d 100644
--- a/Terminal.Gui/Views/ComboBox.cs
+++ b/Terminal.Gui/Views/ComboBox.cs
@@ -484,7 +484,7 @@ namespace Terminal.Gui {
 				search.SetFocus ();
 			}
 
-			search.CursorPosition = search.Text.RuneCount;
+			search.CursorPosition = search.Text.ConsoleWidth;
 
 			return base.OnEnter (view);
 		}