Remove PintaCore dependency from the tool handles.

Author: cameronwhite

Pinta.Tools/Editable/EditEngines/BaseEditEngine.cs

@@ -167,7 +167,8 @@ public ShapeEngine? ActiveShapeEngine {
 	/// </summary>
 	public IEnumerable<IToolHandle> Handles =>
 		SEngines.SelectMany (engine => engine.ControlPointHandles).Append (hover_handle);
-	private readonly MoveHandle hover_handle = new ();
+
+	private readonly MoveHandle hover_handle;
 
 	private readonly Gdk.Cursor grab_cursor = GdkExtensions.CursorFromName (Pinta.Resources.StandardCursors.Grab);
 
@@ -235,6 +236,8 @@ public BaseEditEngine (
 
 		owner = passedOwner;
 
+		hover_handle = new (workspace);
+
 		ResetShapes ();
 	}
 
@@ -765,7 +768,7 @@ public virtual void HandleMouseDown (Document document, ToolMouseEventArgs e)
 		bool clicked_generated_point = false;
 
 		PointD current_window_point = workspace.CanvasPointToView (unclamped_point);
-		MoveHandle test_handle = new ();
+		MoveHandle test_handle = new (workspace);
 
 		// Check if the user is directly clicking on a control point.
 		if (closestControlPoint != null) {
@@ -1235,7 +1238,7 @@ private void DrawControlPoints (Context g, ShapeEngine shape, bool draw_controls
 				continue;
 
 			shape.ControlPointHandles.Add (
-				new MoveHandle {
+				new MoveHandle (workspace) {
 					Active = true,
 					CanvasPosition = point.Position,
 					Selected = (point == SelectedPoint) && draw_selection

Pinta.Tools/Handles/MoveHandle.cs

@@ -16,6 +16,13 @@ public sealed class MoveHandle : IToolHandle
 
 	private const double RADIUS = 4.5;
 
+	private readonly IWorkspaceService workspace;
+
+	public MoveHandle (IWorkspaceService workspace)
+	{
+		this.workspace = workspace;
+	}
+
 	public PointD CanvasPosition { get; set; }
 
 	/// <summary>
@@ -48,7 +55,7 @@ public bool ContainsPoint (PointD window_point)
 	public void Draw (Gtk.Snapshot snapshot)
 	{
 		Gsk.PathBuilder pathBuilder = Gsk.PathBuilder.New ();
-		PointD windowPt = PintaCore.Workspace.CanvasPointToView (CanvasPosition);
+		PointD windowPt = workspace.CanvasPointToView (CanvasPosition);
 		pathBuilder.AddCircle (windowPt.ToGraphenePoint (), (float) RADIUS);
 		Gsk.Path path = pathBuilder.ToPath ();
 
@@ -71,7 +78,7 @@ private RectangleD ComputeWindowRect ()
 	{
 		const double DIAMETER = 2 * RADIUS;
 
-		PointD windowPt = PintaCore.Workspace.CanvasPointToView (CanvasPosition);
+		PointD windowPt = workspace.CanvasPointToView (CanvasPosition);
 		return new RectangleD (windowPt.X - RADIUS, windowPt.Y - RADIUS, DIAMETER, DIAMETER);
 	}
 

Pinta.Tools/Handles/RectangleHandle.cs

@@ -10,24 +10,28 @@ namespace Pinta.Tools;
 /// </summary>
 public class RectangleHandle : IToolHandle
 {
+	private readonly IWorkspaceService workspace;
+
 	private PointD start_pt;
 	private PointD end_pt;
 	private Size image_size;
 	private readonly ImmutableArray<MoveHandle> handles;
 	private MoveHandle? active_handle;
 	private PointD? drag_start_pos;
 
-	public RectangleHandle ()
+	public RectangleHandle (IWorkspaceService workspace)
 	{
+		this.workspace = workspace;
+
 		handles = [
-			new (){ Cursor = GdkExtensions.CursorFromName (Resources.StandardCursors.ResizeNW) },
-			new (){ Cursor = GdkExtensions.CursorFromName (Resources.StandardCursors.ResizeSW) },
-			new (){ Cursor = GdkExtensions.CursorFromName (Resources.StandardCursors.ResizeNE) },
-			new (){ Cursor = GdkExtensions.CursorFromName (Resources.StandardCursors.ResizeSE) },
-			new (){ Cursor = GdkExtensions.CursorFromName (Resources.StandardCursors.ResizeW) },
-			new (){ Cursor = GdkExtensions.CursorFromName (Resources.StandardCursors.ResizeN) },
-			new (){ Cursor = GdkExtensions.CursorFromName (Resources.StandardCursors.ResizeE) },
-			new (){ Cursor = GdkExtensions.CursorFromName (Resources.StandardCursors.ResizeS) },
+			new (workspace){ Cursor = GdkExtensions.CursorFromName (Resources.StandardCursors.ResizeNW) },
+			new (workspace){ Cursor = GdkExtensions.CursorFromName (Resources.StandardCursors.ResizeSW) },
+			new (workspace){ Cursor = GdkExtensions.CursorFromName (Resources.StandardCursors.ResizeNE) },
+			new (workspace){ Cursor = GdkExtensions.CursorFromName (Resources.StandardCursors.ResizeSE) },
+			new (workspace){ Cursor = GdkExtensions.CursorFromName (Resources.StandardCursors.ResizeW) },
+			new (workspace){ Cursor = GdkExtensions.CursorFromName (Resources.StandardCursors.ResizeN) },
+			new (workspace){ Cursor = GdkExtensions.CursorFromName (Resources.StandardCursors.ResizeE) },
+			new (workspace){ Cursor = GdkExtensions.CursorFromName (Resources.StandardCursors.ResizeS) },
 		];
 
 		foreach (var handle in handles)
@@ -79,7 +83,7 @@ public bool BeginDrag (in PointD canvasPos, in Size imageSize)
 
 		image_size = imageSize;
 
-		PointD viewPos = PintaCore.Workspace.CanvasPointToView (canvasPos);
+		PointD viewPos = workspace.CanvasPointToView (canvasPos);
 		UpdateHandleUnderPoint (viewPos);
 
 		if (active_handle is null)
@@ -122,7 +126,7 @@ public bool HasDragged (PointD canvasPos)
 		if (drag_start_pos is null)
 			throw new InvalidOperationException ("Drag operation has not been started!");
 
-		PointD viewPos = PintaCore.Workspace.CanvasPointToView (canvasPos);
+		PointD viewPos = workspace.CanvasPointToView (canvasPos);
 		return drag_start_pos.Value.Distance (viewPos) > 1;
 	}
 

Pinta.Tools/Tools/SelectTool.cs

@@ -52,7 +52,7 @@ public SelectTool (IServiceProvider services) : base (services)
 		tools = services.GetService<IToolService> ();
 		workspace = services.GetService<IWorkspaceService> ();
 
-		handle = new () { InvertIfNegative = true };
+		handle = new (workspace) { InvertIfNegative = true };
 
 		workspace.SelectionChanged += AfterSelectionChange;
 	}