Scale blocks when dragged over canvas

Author: wnbaum

addons/block_code/drag_manager/drag_manager.gd

@@ -57,9 +57,14 @@ class Drag:
 	func add_delete_area(delete_area: Rect2):
 		_delete_areas.append(delete_area)
 
-	func update_drag_position():
+	func update_drag_state():
 		global_position = get_global_mouse_position()
 
+		if _block_canvas.is_mouse_over():
+			scale = Vector2(_block_canvas.zoom, _block_canvas.zoom)
+		else:
+			scale = Vector2(1, 1)
+
 		for rect in _delete_areas:
 			if rect.has_point(get_global_mouse_position()):
 				action = DragAction.REMOVE
@@ -71,7 +76,7 @@ class Drag:
 		target_snap_point = _find_closest_snap_point()
 
 	func apply_drag() -> Block:
-		update_drag_position()
+		update_drag_state()
 
 		if action == DragAction.PLACE:
 			_place_block()
@@ -147,7 +152,7 @@ class Drag:
 		var closest_distance: int
 		for snap_point in _snap_points:
 			var distance = _get_distance_to_snap_point(snap_point)
-			if distance > Constants.MINIMUM_SNAP_DISTANCE:
+			if distance > Constants.MINIMUM_SNAP_DISTANCE * _block_canvas.zoom:
 				continue
 			elif closest_snap_point == null or distance < closest_distance:
 				closest_snap_point = snap_point
@@ -202,7 +207,7 @@ func _ready():
 
 func _process(_delta):
 	if drag:
-		drag.update_drag_position()
+		drag.update_drag_state()
 
 
 func drag_block(block: Block, copied_from: Block = null):
@@ -215,6 +220,9 @@ func drag_block(block: Block, copied_from: Block = null):
 	else:
 		offset = Vector2.ZERO
 
+	if _block_canvas.is_ancestor_of(block):
+		offset /= _block_canvas.zoom
+
 	var parent = block.get_parent()
 
 	if parent:

addons/block_code/ui/block_canvas/block_canvas.gd

@@ -28,6 +28,11 @@ const ZOOM_FACTOR: float = 1.1
 
 var _block_scenes_by_class = {}
 var _panning := false
+var zoom: float:
+	set(value):
+		_window.scale = Vector2(value, value)
+	get:
+		return _window.scale.x
 
 signal reconnect_block(block: Block)
 signal add_block_code
@@ -82,7 +87,7 @@ func bsd_selected(bsd: BlockScriptData):
 	var edited_node = EditorInterface.get_inspector().get_edited_object() as Node
 
 	_window.position = Vector2(0, 0)
-	_window.scale = Vector2(1, 1)
+	zoom = 1
 	_zoom_label.visible = false
 
 	_empty_box.visible = false
@@ -112,6 +117,7 @@ func bsd_selected(bsd: BlockScriptData):
 		_selected_node_label.text = _selected_node_label_format.format({"node": edited_node.name})
 		_add_block_code_button.disabled = false
 
+
 func _load_bsd(bsd: BlockScriptData):
 	for tree in bsd.block_trees.array:
 		load_tree(_window, tree)
@@ -235,14 +241,14 @@ func _input(event):
 		if is_mouse_over():
 			var old_mouse_window_pos := canvas_to_window(relative_mouse_pos)
 
-			if event.button_index == MOUSE_BUTTON_WHEEL_UP and _window.scale.x < 2:
-				_window.scale *= ZOOM_FACTOR
-			if event.button_index == MOUSE_BUTTON_WHEEL_DOWN and _window.scale.x > 0.2:
-				_window.scale /= ZOOM_FACTOR
+			if event.button_index == MOUSE_BUTTON_WHEEL_UP and zoom < 2:
+				zoom *= ZOOM_FACTOR
+			if event.button_index == MOUSE_BUTTON_WHEEL_DOWN and zoom > 0.2:
+				zoom /= ZOOM_FACTOR
 
-			_zoom_label.text = "%.1fx" % _window.scale.x
+			_zoom_label.text = "%.1fx" % zoom
 
-			_window.position -= (old_mouse_window_pos - canvas_to_window(relative_mouse_pos)) * _window.scale.x
+			_window.position -= (old_mouse_window_pos - canvas_to_window(relative_mouse_pos)) * zoom
 
 	if event is InputEventMouseMotion:
 		if (Input.is_key_pressed(KEY_SHIFT) and _panning) or (Input.is_mouse_button_pressed(MOUSE_BUTTON_MIDDLE) and _panning):