Fix bug where the selection would be in a wrong position while moving or holding a handle, and confirming or canceling a transformation before letting go of the mouse

Author: OverloadedOrama

src/Tools/BaseSelectionTool.gd

@@ -16,6 +16,9 @@ var _add := false  ## Shift + Mouse Click
 var _subtract := false  ## Ctrl + Mouse Click
 var _intersect := false  ## Shift + Ctrl + Mouse Click
 
+## Used to check if the state of content transformation has been changed
+## while draw_move() is being called. For example, pressing Enter while still moving content
+var _transformation_status_changed := false
 var _skip_slider_logic := false
 
 @onready var selection_node := Global.canvas.selection
@@ -28,14 +31,16 @@ var _skip_slider_logic := false
 
 
 func _ready() -> void:
-	super._ready()
-	algorithm_option_button.add_item("Nearest Neighbor")
+	super()
+	algorithm_option_button.add_item("Nearest neighbor")
 	algorithm_option_button.add_item("cleanEdge", DrawingAlgos.RotationAlgorithm.CLEANEDGE)
 	algorithm_option_button.add_item("OmniScale", DrawingAlgos.RotationAlgorithm.OMNISCALE)
 	algorithm_option_button.select(0)
 	set_confirm_buttons_visibility()
 	set_spinbox_values()
 	refresh_options()
+	selection_node.transformation_confirmed.connect(func(): _transformation_status_changed = true)
+	selection_node.transformation_canceled.connect(func(): _transformation_status_changed = true)
 	transformation_handles.preview_transform_changed.connect(set_confirm_buttons_visibility)
 
 
@@ -91,7 +96,8 @@ func set_spinbox_values() -> void:
 
 func draw_start(pos: Vector2i) -> void:
 	pos = snap_position(pos)
-	super.draw_start(pos)
+	super(pos)
+	_transformation_status_changed = false
 	if transformation_handles.arrow_key_move:
 		return
 	var project := Global.current_project
@@ -136,9 +142,11 @@ func draw_start(pos: Vector2i) -> void:
 
 func draw_move(pos: Vector2i) -> void:
 	pos = snap_position(pos)
-	super.draw_move(pos)
+	super(pos)
 	if transformation_handles.arrow_key_move:
 		return
+	if _transformation_status_changed:
+		return
 	if not _move:
 		return
 	var project := Global.current_project
@@ -173,7 +181,7 @@ func draw_move(pos: Vector2i) -> void:
 
 func draw_end(pos: Vector2i) -> void:
 	pos = snap_position(pos)
-	super.draw_end(pos)
+	super(pos)
 	if transformation_handles.arrow_key_move:
 		return
 	if not _move:

src/UI/Canvas/Selection.gd

@@ -1,6 +1,9 @@
 class_name SelectionNode
 extends Node2D
 
+signal transformation_confirmed
+signal transformation_canceled
+
 enum SelectionOperation { ADD, SUBTRACT, INTERSECT }
 const CLIPBOARD_FILE_PATH := "user://clipboard.txt"
 
@@ -129,6 +132,7 @@ func transform_content_confirm() -> void:
 	is_pasting = false
 	queue_redraw()
 	canvas.queue_redraw()
+	transformation_confirmed.emit()
 
 
 func transform_content_cancel() -> void:
@@ -152,6 +156,7 @@ func transform_content_cancel() -> void:
 	is_pasting = false
 	queue_redraw()
 	canvas.queue_redraw()
+	transformation_canceled.emit()
 
 
 func commit_undo(action: String, undo_data_tmp: Dictionary) -> void:

src/UI/Canvas/TransformationHandles.gd

@@ -102,6 +102,8 @@ class TransformHandle:
 
 
 func _ready() -> void:
+	selection_node.transformation_confirmed.connect(func(): active_handle = null)
+	selection_node.transformation_canceled.connect(func(): active_handle = null)
 	preview_transform_changed.connect(_on_preview_transform_changed)
 	Global.camera.zoom_changed.connect(queue_redraw)
 	set_process_input(false)