Merge branch 'master' into idisposable

Terminal.Gui/Core/View.cs

@@ -1181,7 +1181,7 @@ namespace Terminal.Gui {
 			if (subviews == null || subviews.Count == 0)
 				return false;
 			foreach (var view in subviews)
-				if (view.SuperView.IsCurrentTop && view.ProcessHotKey (keyEvent))
+				if (view.ProcessHotKey (keyEvent))
 					return true;
 			return false;
 		}
@@ -1196,7 +1196,7 @@ namespace Terminal.Gui {
 			if (subviews == null || subviews.Count == 0)
 				return false;
 			foreach (var view in subviews)
-				if (view.SuperView.IsCurrentTop && view.ProcessColdKey (keyEvent))
+				if (view.ProcessColdKey (keyEvent))
 					return true;
 			return false;
 		}
@@ -1216,7 +1216,7 @@ namespace Terminal.Gui {
 			if (subviews == null || subviews.Count == 0)
 				return false;
 			foreach (var view in subviews)
-				if (view.SuperView.IsCurrentTop && view.OnKeyDown (keyEvent))
+				if (view.HasFocus && view.OnKeyDown (keyEvent))
 					return true;
 
 			return false;
@@ -1237,7 +1237,7 @@ namespace Terminal.Gui {
 			if (subviews == null || subviews.Count == 0)
 				return false;
 			foreach (var view in subviews)
-				if (view.SuperView.IsCurrentTop && view.OnKeyUp (keyEvent))
+				if (view.HasFocus && view.OnKeyUp (keyEvent))
 					return true;
 
 			return false;