Move CairoExtensions.PointsToRectangle into RectangleD

Author: cameronwhite

Pinta.Core/Classes/DocumentWorkspace.cs

@@ -170,7 +170,7 @@ public void InvalidateWindowRect (RectangleI windowRect)
 		PointD canvasTopLeft = ViewPointToCanvas (windowTopLeft);
 		PointD canvasBtmRight = ViewPointToCanvas (windowBtmRight);
 
-		RectangleI canvasRect = CairoExtensions.PointsToRectangle (canvasTopLeft, canvasBtmRight).ToInt ();
+		RectangleI canvasRect = RectangleD.FromPoints (canvasTopLeft, canvasBtmRight).ToInt ();
 		OnCanvasInvalidated (new CanvasInvalidatedEventArgs (canvasRect));
 	}
 

Pinta.Core/Classes/Rectangle.cs

@@ -50,6 +50,20 @@ double bottom
 			right - left + 1,
 			bottom - top + 1);
 
+	/// <summary>
+	/// Creates a rectangle with positive width & height from the provided points.
+	/// Note that the second point will be the bottom right corner of the rectangle,
+	/// and the pixel is not inside the rectangle itself.
+	/// </summary>
+	public static RectangleD FromPoints (in PointD a, in PointD b)
+	{
+		double x1 = Math.Min (a.X, b.X);
+		double y1 = Math.Min (a.Y, b.Y);
+		double x2 = Math.Max (a.X, b.X);
+		double y2 = Math.Max (a.Y, b.Y);
+		return new (x1, y1, x2 - x1, y2 - y1);
+	}
+
 	public static RectangleD Zero { get; } = new (0d, 0d, 0d, 0d);
 
 	public readonly RectangleI ToInt ()

Pinta.Core/Extensions/Cairo/CairoExtensions.Geometry.cs

@@ -55,25 +55,6 @@ public static RectangleD StrokeExtents (this Context g)
 			y2 - y1);
 	}
 
-	/// <summary>
-	/// Create a rectangle with a positive width / height from the provided points.
-	/// </summary>
-	public static RectangleD PointsToRectangle (
-		PointD p1,
-		PointD p2)
-	{
-		double y1 = Math.Min (p1.Y, p2.Y);
-		double y2 = Math.Max (p1.Y, p2.Y);
-		double x1 = Math.Min (p1.X, p2.X);
-		double x2 = Math.Max (p1.X, p2.X);
-
-		return new (
-			x1,
-			y1,
-			x2 - x1,
-			y2 - y1);
-	}
-
 	public static Region CreateRegion (in RectangleI rect)
 	{
 		CairoRectangleInt cairo_rect = new () {

Pinta.Tools/Tools/SelectTool.cs

@@ -349,7 +349,7 @@ private RectangleI ReDraw (Document document)
 
 		ShowHandles (true);
 
-		RectangleD rect = CairoExtensions.PointsToRectangle (shape_origin, shape_end);
+		RectangleD rect = RectangleD.FromPoints (shape_origin, shape_end);
 
 		DrawShape (document, rect, document.Layers.SelectionLayer);
 

Pinta.Tools/Tools/ZoomTool.cs

@@ -126,11 +126,11 @@ protected override void OnMouseUp (Document document, ToolMouseEventArgs e)
 
 		if (mouse_down == MouseButton.Left || mouse_down == MouseButton.Right) {
 			if (e.MouseButton == MouseButton.Left) {
-				var shape_origin_window = document.Workspace.CanvasPointToView (shape_origin);
-				if (shape_origin_window.Distance (e.WindowPoint) <= tolerance) {
+				PointD shapeOriginWindow = document.Workspace.CanvasPointToView (shape_origin);
+				if (shapeOriginWindow.Distance (e.WindowPoint) <= tolerance) {
 					document.Workspace.ZoomInAroundCanvasPoint (e.PointDouble);
 				} else {
-					document.Workspace.ZoomToCanvasRectangle (CairoExtensions.PointsToRectangle (shape_origin, e.PointDouble));
+					document.Workspace.ZoomToCanvasRectangle (RectangleD.FromPoints (shape_origin, e.PointDouble));
 				}
 			} else {
 				document.Workspace.ZoomOutAroundCanvasPoint (e.PointDouble);
@@ -149,7 +149,7 @@ private void UpdateRectangle (Document document, PointD point)
 		if (!is_drawing)
 			return;
 
-		var r = CairoExtensions.PointsToRectangle (shape_origin.Rounded (), point.Rounded ());
+		RectangleD r = RectangleD.FromPoints (shape_origin.Rounded (), point.Rounded ());
 
 		document.Layers.ToolLayer.Clear ();
 		document.Layers.ToolLayer.Hidden = false;

tests/Pinta.Core.Tests/RectangleTests.cs

@@ -38,6 +38,7 @@ public void ConsistentLTRBFactory (int l, int t, int r, int b)
 	public void CorrectFromPoints (PointI a, PointI b, RectangleI expected)
 	{
 		Assert.That (RectangleI.FromPoints (a, b), Is.EqualTo (expected));
+		Assert.That (RectangleD.FromPoints (a.ToDouble (), b.ToDouble ()), Is.EqualTo (expected.ToDouble ()));
 	}
 
 	[TestCaseSource (nameof (not_equal_cases))]