src/Autoload/Global.gd

@@ -518,8 +518,6 @@ var native_cursors := false:
 	set(value):
 		if value == native_cursors:
 			return
-		if DisplayServer.get_name() == "headless":
-			return
 		native_cursors = value
 		if native_cursors:
 			Input.set_custom_mouse_cursor(null, Input.CURSOR_CROSS, Vector2(15, 15))
@@ -1014,8 +1012,6 @@ func set_locale(locale: String) -> void:
 
 
 ## Used by undo/redo operations to store compressed images in memory.
-## [param redo_data] and [param undo_data] are Dictionaries,
-## with keys of type [Image] and [Dictionary] values, coming from [member Image.data].
 func undo_redo_compress_images(
 	redo_data: Dictionary, undo_data: Dictionary, project := current_project
 ) -> void:
@@ -1042,7 +1038,7 @@ func undo_redo_compress_images(
 
 
 ## Decompresses the [param compressed_image_data] with [param buffer_size] to the [param image]
-## This is a memory optimization method used while performing undo/redo drawing operations.
+## This is an optimization method used while performing undo/redo drawing operations.
 func undo_redo_draw_op(
 	image: Image, new_size: Vector2i, compressed_image_data: PackedByteArray, buffer_size: int
 ) -> void:
@@ -1050,6 +1046,16 @@ func undo_redo_draw_op(
 	image.set_data(new_size.x, new_size.y, image.has_mipmaps(), image.get_format(), decompressed)
 
 
+## Used by the Move tool for undo/redo, moves all of the [Image]s in [param images]
+## by [param diff] pixels.
+func undo_redo_move(diff: Vector2i, images: Array[Image]) -> void:
+	for image in images:
+		var image_copy := Image.new()
+		image_copy.copy_from(image)
+		image.fill(Color(0, 0, 0, 0))
+		image.blit_rect(image_copy, Rect2i(Vector2i.ZERO, image.get_size()), diff)
+
+
 func create_ui_for_shader_uniforms(
 	shader: Shader,
 	params: Dictionary,

src/Autoload/OpenSave.gd

@@ -92,9 +92,6 @@ func add_import_option(import_name: StringName, import_scene: PackedScene) -> in
 
 
 func handle_loading_image(file: String, image: Image) -> void:
-	if Global.projects.size() <= 1 and Global.current_project.is_empty():
-		open_image_as_new_tab(file, image)
-		return
 	var preview_dialog := preview_dialog_tscn.instantiate() as ImportPreviewDialog
 	# add custom importers to preview dialog
 	for import_name in custom_import_names.keys():

src/Main.gd

@@ -238,8 +238,6 @@ func _handle_layout_files() -> void:
 
 
 func _setup_application_window_size() -> void:
-	if DisplayServer.get_name() == "headless":
-		return
 	var root := get_tree().root
 	root.content_scale_aspect = Window.CONTENT_SCALE_ASPECT_IGNORE
 	root.content_scale_mode = Window.CONTENT_SCALE_MODE_DISABLED
@@ -273,6 +271,7 @@ func _setup_application_window_size() -> void:
 func set_custom_cursor() -> void:
 	if Global.native_cursors:
 		return
+
 	if Global.shrink == 1.0:
 		Input.set_custom_mouse_cursor(cursor_image, Input.CURSOR_CROSS, Vector2(15, 15))
 	else:
@@ -544,12 +543,6 @@ func _clear_backup_files() -> void:
 
 
 func _exit_tree() -> void:
-	for project in Global.projects:
-		project.remove()
-	# For some reason, the above is not enough to remove all backup files
-	_clear_backup_files()
-	if DisplayServer.get_name() == "headless":
-		return
 	Global.config_cache.set_value("window", "layout", Global.layouts.find(main_ui.layout))
 	Global.config_cache.set_value("window", "screen", get_window().current_screen)
 	Global.config_cache.set_value(
@@ -571,3 +564,8 @@ func _exit_tree() -> void:
 	Global.config_cache.set_value("view_menu", "show_guides", Global.show_guides)
 	Global.config_cache.set_value("view_menu", "show_mouse_guides", Global.show_mouse_guides)
 	Global.config_cache.save("user://cache.ini")
+
+	for project in Global.projects:
+		project.remove()
+	# For some reason, the above is not enough to remove all backup files
+	_clear_backup_files()

src/Tools/UtilityTools/Move.gd

@@ -2,11 +2,11 @@ extends BaseTool
 
 var _start_pos: Vector2i
 var _offset: Vector2i
+
 ## 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 _content_transformation_check := false
 var _snap_to_grid := false  ## Mouse Click + Ctrl
-var _undo_data := {}
 
 @onready var selection_node: Node2D = Global.canvas.selection
 
@@ -40,7 +40,6 @@ func draw_start(pos: Vector2i) -> void:
 		return
 	_start_pos = pos
 	_offset = pos
-	_undo_data = _get_undo_data()
 	if Global.current_project.has_selection:
 		selection_node.transform_content_start()
 	_content_transformation_check = selection_node.is_moving_content
@@ -83,13 +82,8 @@ func draw_end(pos: Vector2i) -> void:
 		else:
 			var pixel_diff := pos - _start_pos
 			Global.canvas.move_preview_location = Vector2i.ZERO
-			var images := _get_selected_draw_images()
-			for image in images:
-				var image_copy := Image.new()
-				image_copy.copy_from(image)
-				image.fill(Color(0, 0, 0, 0))
-				image.blit_rect(image_copy, Rect2i(Vector2i.ZERO, project.size), pixel_diff)
-			_commit_undo("Draw")
+
+			_commit_undo("Draw", pixel_diff)
 
 	_start_pos = Vector2.INF
 	_snap_to_grid = false
@@ -121,8 +115,7 @@ func _snap_position(pos: Vector2) -> Vector2:
 	return pos
 
 
-func _commit_undo(action: String) -> void:
-	var redo_data := _get_undo_data()
+func _commit_undo(action: String, diff: Vector2i) -> void:
 	var project := Global.current_project
 	var frame := -1
 	var layer := -1
@@ -130,29 +123,11 @@ func _commit_undo(action: String) -> void:
 		frame = project.current_frame
 		layer = project.current_layer
 
+	var images := _get_selected_draw_images()
 	project.undos += 1
 	project.undo_redo.create_action(action)
-	Global.undo_redo_compress_images(redo_data, _undo_data, project)
+	project.undo_redo.add_do_method(Global.undo_redo_move.bind(diff, images))
 	project.undo_redo.add_do_method(Global.undo_or_redo.bind(false, frame, layer))
+	project.undo_redo.add_undo_method(Global.undo_redo_move.bind(-diff, images))
 	project.undo_redo.add_undo_method(Global.undo_or_redo.bind(true, frame, layer))
 	project.undo_redo.commit_action()
-	_undo_data.clear()
-
-
-func _get_undo_data() -> Dictionary:
-	var data := {}
-	var project := Global.current_project
-	var cels: Array[BaseCel] = []
-	if Global.animation_timer.is_stopped():
-		for cel_index in project.selected_cels:
-			cels.append(project.frames[cel_index[0]].cels[cel_index[1]])
-	else:
-		for frame in project.frames:
-			var cel := frame.cels[project.current_layer]
-			cels.append(cel)
-	for cel in cels:
-		if not cel is PixelCel:
-			continue
-		var image: Image = cel.image
-		data[image] = image.data
-	return data

src/UI/Canvas/CanvasCamera.gd

@@ -43,7 +43,6 @@ var should_tween := true
 
 
 func _ready() -> void:
-	viewport.size_changed.connect(_update_viewport_transform)
 	Global.project_switched.connect(_project_switched)
 	if not DisplayServer.is_touchscreen_available():
 		set_process_input(false)