Fixes #2360 - v2 View re-architecture..

Example/Example.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <!-- Version numbers are automatically updated by gitversion when a release is released -->
     <!-- In the source tree the version will always be 1.0 for all projects. -->
     <!-- Do not modify these. -->

ReactiveExample/ReactiveExample.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <!-- Version numbers are automatically updated by gitversion when a release is released -->
     <!-- In the source tree the version will always be 2.0 for all projects. -->
     <!-- Do not modify these. -->

Terminal.Gui/ClassDiagram1.cd

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ClassDiagram /> 

Terminal.Gui/ConsoleDrivers/CursesDriver/binding.cs

@@ -328,9 +328,10 @@ static public int IsAlt (int key)
 		static public int set_escdelay (int size) => methods.set_escdelay (size);
 	}
 
-#pragma warning disable RCS1102 // Make class static.
+#pragma warning disable RCS1102 // Make class static.'
 	internal class Delegates {
 #pragma warning restore RCS1102 // Make class static.
+#pragma warning disable CS8981 // The type name only contains lower-cased ascii characters. Such names may become reserved for the language.
 		public delegate IntPtr initscr ();
 		public delegate int endwin ();
 		public delegate bool isendwin ();
@@ -555,4 +556,6 @@ public NativeMethods (UnmanagedLibrary lib)
 		}
 	}
 #pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
+#pragma warning restore CS8981 // The type name only contains lower-cased ascii characters. Such names may become reserved for the language.
+
 }

Terminal.Gui/Core/Application.cs

@@ -671,6 +671,15 @@ static View FindDeepestMdiView (View start, int x, int y, out int resx, out int
 			return start;
 		}
 
+		/// <summary>
+		/// Finds the deepest view at the specified coordinates, specified relative to <paramref name="start"/>'s superview.
+		/// </summary>
+		/// <param name="start"></param>
+		/// <param name="x"></param>
+		/// <param name="y"></param>
+		/// <param name="resx"></param>
+		/// <param name="resy"></param>
+		/// <returns></returns>
 		static View FindDeepestView (View start, int x, int y, out int resx, out int resy)
 		{
 			var startFrame = start.Frame;
@@ -680,12 +689,11 @@ static View FindDeepestView (View start, int x, int y, out int resx, out int res
 				resy = 0;
 				return null;
 			}
-
 			if (start.InternalSubviews != null) {
 				int count = start.InternalSubviews.Count;
 				if (count > 0) {
-					var rx = x - startFrame.X;
-					var ry = y - startFrame.Y;
+					var rx = x - (startFrame.X + start.GetBoundsOffset ().X);
+					var ry = y - (startFrame.Y + start.GetBoundsOffset ().Y);
 					for (int i = count - 1; i >= 0; i--) {
 						View v = start.InternalSubviews [i];
 						if (v.Visible && v.Frame.Contains (rx, ry)) {
@@ -826,10 +834,11 @@ static void ProcessMouseEvent (MouseEvent me)
 
 			var view = FindDeepestView (Current, me.X, me.Y, out int rx, out int ry);
 
-			if (view != null && view.WantContinuousButtonPressed)
+			if (view != null && view.WantContinuousButtonPressed) {
 				WantContinuousButtonPressedView = view;
-			else
+			} else {
 				WantContinuousButtonPressedView = null;
+			}
 			if (view != null) {
 				me.View = view;
 			}
@@ -842,7 +851,7 @@ static void ProcessMouseEvent (MouseEvent me)
 			if (mouseGrabView != null) {
 				view ??= mouseGrabView;
 
-				var newxy = mouseGrabView.ScreenToView (me.X, me.Y);
+				var newxy = mouseGrabView.ScreenToBounds (me.X, me.Y);
 				var nme = new MouseEvent () {
 					X = newxy.X,
 					Y = newxy.Y,
@@ -1045,8 +1054,9 @@ public static RunState Begin (Toplevel toplevel)
 			}
 
 			Driver.PrepareToRun (MainLoop, ProcessKeyEvent, ProcessKeyDownEvent, ProcessKeyUpEvent, ProcessMouseEvent);
-			if (toplevel.LayoutStyle == LayoutStyle.Computed)
+			if (toplevel.LayoutStyle == LayoutStyle.Computed) {
 				toplevel.SetRelativeLayout (new Rect (0, 0, Driver.Cols, Driver.Rows));
+			}
 			toplevel.LayoutSubviews ();
 			toplevel.PositionToplevels ();
 			toplevel.WillPresent ();
@@ -1261,7 +1271,7 @@ public static void RunMainLoopIteration (ref RunState state, bool wait, ref bool
 			firstIteration = false;
 
 			if (state.Toplevel != Top
-				&& (!Top.NeedDisplay.IsEmpty || Top.ChildNeedsDisplay || Top.LayoutNeeded)) {
+				&& (!Top._needsDisplay.IsEmpty || Top._childNeedsDisplay || Top.LayoutNeeded)) {
 				Top.Redraw (Top.Bounds);
 				foreach (var top in toplevels.Reverse ()) {
 					if (top != Top && top != state.Toplevel) {
@@ -1273,13 +1283,14 @@ public static void RunMainLoopIteration (ref RunState state, bool wait, ref bool
 			}
 			if (toplevels.Count == 1 && state.Toplevel == Top
 				&& (Driver.Cols != state.Toplevel.Frame.Width || Driver.Rows != state.Toplevel.Frame.Height)
-				&& (!state.Toplevel.NeedDisplay.IsEmpty || state.Toplevel.ChildNeedsDisplay || state.Toplevel.LayoutNeeded)) {
+				&& (!state.Toplevel._needsDisplay.IsEmpty || state.Toplevel._childNeedsDisplay || state.Toplevel.LayoutNeeded)) {
 
 				Driver.SetAttribute (Colors.TopLevel.Normal);
 				state.Toplevel.Clear (new Rect (0, 0, Driver.Cols, Driver.Rows));
 
 			}
-			if (!state.Toplevel.NeedDisplay.IsEmpty || state.Toplevel.ChildNeedsDisplay || state.Toplevel.LayoutNeeded
+
+			if (!state.Toplevel._needsDisplay.IsEmpty || state.Toplevel._childNeedsDisplay || state.Toplevel.LayoutNeeded
 				|| MdiChildNeedsDisplay ()) {
 				state.Toplevel.Redraw (state.Toplevel.Bounds);
 				if (DebugDrawBounds) {
@@ -1291,7 +1302,7 @@ public static void RunMainLoopIteration (ref RunState state, bool wait, ref bool
 				Driver.UpdateCursor ();
 			}
 			if (state.Toplevel != Top && !state.Toplevel.Modal
-				&& (!Top.NeedDisplay.IsEmpty || Top.ChildNeedsDisplay || Top.LayoutNeeded)) {
+				&& (!Top._needsDisplay.IsEmpty || Top._childNeedsDisplay || Top.LayoutNeeded)) {
 				Top.Redraw (Top.Bounds);
 			}
 		}
@@ -1320,7 +1331,7 @@ static bool MdiChildNeedsDisplay ()
 			}
 
 			foreach (var top in toplevels) {
-				if (top != Current && top.Visible && (!top.NeedDisplay.IsEmpty || top.ChildNeedsDisplay || top.LayoutNeeded)) {
+				if (top != Current && top.Visible && (!top._needsDisplay.IsEmpty || top._childNeedsDisplay || top.LayoutNeeded)) {
 					MdiTop.SetSubViewNeedsDisplay ();
 					return true;
 				}