renamed Thickenss.InnerRect to Thickness.Inside

Terminal.Gui/ClassDiagram1.cd

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

Terminal.Gui/Core/Application.cs

@@ -690,7 +690,7 @@ namespace Terminal.Gui {
 				return null;
 			}
 
-			startFrame = start.Padding.Thickness.GetInnerRect (start.BorderFrame.Thickness.GetInnerRect (start.Margin.Thickness.GetInnerRect (startFrame)));
+			startFrame = start.Padding.Thickness.GetInside (start.BorderFrame.Thickness.GetInside (start.Margin.Thickness.GetInside (startFrame)));
 			if (start.InternalSubviews != null) {
 				int count = start.InternalSubviews.Count;
 				if (count > 0) {

Terminal.Gui/Core/Frame.cs

@@ -189,7 +189,7 @@ namespace Terminal.Gui {
 		/// </summary>
 		public override Rect Bounds {
 			get {
-				return Thickness?.GetInnerRect (new Rect (Point.Empty, Frame.Size)) ?? new Rect (Point.Empty, Frame.Size);
+				return Thickness?.GetInside (new Rect (Point.Empty, Frame.Size)) ?? new Rect (Point.Empty, Frame.Size);
 			}
 			set {
 				throw new InvalidOperationException ("It makes no sense to set Bounds of a Thickness.");

Terminal.Gui/Core/Thickness.cs

@@ -109,7 +109,7 @@ namespace Terminal.Gui {
 		/// </summary>
 		/// <param name="rect">The source rectangle</param>
 		/// <returns></returns>
-		public Rect GetInnerRect (Rect rect)
+		public Rect GetInside (Rect rect)
 		{
 			var width = rect.Size.Width - (Left + Right);
 			var height = rect.Size.Height - (Top + Bottom);
@@ -212,7 +212,7 @@ namespace Terminal.Gui {
 				tf.Draw (rect, Application.Driver.CurrentAttribute, Application.Driver.CurrentAttribute, rect, false);
 			}
 
-			return GetInnerRect (rect);
+			return GetInside (rect);
 
 		}
 

Terminal.Gui/Core/View.cs

@@ -508,7 +508,7 @@ namespace Terminal.Gui {
 					return Bounds;
 				}
 
-				return Padding.Thickness.GetInnerRect (BorderFrame.Thickness.GetInnerRect (Margin.Thickness.GetInnerRect (new Rect (default, Frame.Size))));
+				return Padding.Thickness.GetInside (BorderFrame.Thickness.GetInside (Margin.Thickness.GetInside (new Rect (default, Frame.Size))));
 			}
 		}
 
@@ -567,7 +567,7 @@ namespace Terminal.Gui {
 				Margin.SetNeedsDisplay ();
 			}
 			if (BorderFrame != null) {
-				var border = Margin?.Thickness.GetInnerRect (Margin.Frame) ?? Frame;
+				var border = Margin?.Thickness.GetInside (Margin.Frame) ?? Frame;
 				BorderFrame.X = border.Location.X;
 				BorderFrame.Y = border.Location.Y;
 				BorderFrame.Width = border.Size.Width;
@@ -577,9 +577,9 @@ namespace Terminal.Gui {
 				BorderFrame.SetNeedsDisplay ();
 			}
 			if (Padding != null) {
-				var padding = BorderFrame?.Thickness.GetInnerRect (BorderFrame?.Frame ??
-					(Margin?.Thickness.GetInnerRect (Margin.Frame) ?? Frame)) ??
-						Margin?.Thickness.GetInnerRect (Margin.Frame) ?? Frame;
+				var padding = BorderFrame?.Thickness.GetInside (BorderFrame?.Frame ??
+					(Margin?.Thickness.GetInside (Margin.Frame) ?? Frame)) ??
+						Margin?.Thickness.GetInside (Margin.Frame) ?? Frame;
 				Padding.X = padding.Location.X;
 				Padding.Y = padding.Location.Y;
 				Padding.Width = padding.Size.Width;
@@ -646,7 +646,7 @@ namespace Terminal.Gui {
 				if (Padding == null || BorderFrame == null || Margin == null) {
 					return new Rect (default, Frame.Size);
 				}
-				var frameRelativeBounds = Padding.Thickness.GetInnerRect (Padding.Frame);
+				var frameRelativeBounds = Padding.Thickness.GetInside (Padding.Frame);
 				return new Rect (default, frameRelativeBounds.Size);
 			}
 			set {
@@ -1360,7 +1360,7 @@ namespace Terminal.Gui {
 		public Point ScreenToBounds (int x, int y)
 		{
 			if (SuperView == null) {
-				var inner = Padding.Thickness.GetInnerRect (BorderFrame.Thickness.GetInnerRect (Margin.Thickness.GetInnerRect (Frame)));
+				var inner = Padding.Thickness.GetInside (BorderFrame.Thickness.GetInside (Margin.Thickness.GetInside (Frame)));
 				return new Point (x - inner.X, y - inner.Y);
 			} else {
 				var parent = SuperView.ScreenToView (x, y);
@@ -1385,7 +1385,7 @@ namespace Terminal.Gui {
 				rrow = row + Frame.Y;
 				rcol = col + Frame.X;
 			} else {
-				var inner = Padding.Thickness.GetInnerRect (BorderFrame.Thickness.GetInnerRect (Margin.Thickness.GetInnerRect (Frame)));
+				var inner = Padding.Thickness.GetInside (BorderFrame.Thickness.GetInside (Margin.Thickness.GetInside (Frame)));
 				rrow = row + inner.Y;
 				rcol = col + inner.X;
 			}
@@ -1393,7 +1393,7 @@ namespace Terminal.Gui {
 			var super = SuperView;
 			while (super != null) {
 				if (!(super.Padding == null || super.BorderFrame == null || super.Margin == null)) {
-					var inner = super.Padding.Thickness.GetInnerRect (super.BorderFrame.Thickness.GetInnerRect (super.Margin.Thickness.GetInnerRect (super.Frame)));
+					var inner = super.Padding.Thickness.GetInside (super.BorderFrame.Thickness.GetInside (super.Margin.Thickness.GetInside (super.Frame)));
 					rrow += inner.Y;
 					rcol += inner.X;
 				} else {

UnitTests/Core/ThicknessTests.cs

@@ -155,11 +155,11 @@ namespace Terminal.Gui.CoreTests {
 
 
 		[Fact ()]
-		public void GetInnerRectTest ()
+		public void GetInsideTest ()
 		{
 			var t = new Thickness (1, 2, 3, 4);
 			var r = new Rect (10, 20, 30, 40);
-			var r2 = t.GetInnerRect (r);
+			var r2 = t.GetInside (r);
 			Assert.Equal (11, r2.X);
 			Assert.Equal (22, r2.Y);
 			Assert.Equal (26, r2.Width);