huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-18 17:19:50 +00:00
Code Issues Wiki Activity

When running in headless mode, don't set a custom cursor and don't save window data on exit

Browse source
This commit is contained in:
Emmanouil Papadeas 2024-04-05 20:36:03 +03:00
parent 1062f88e4c
commit 971fb67db1
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Autoload/Global.gd
View file

@ -518,6 +518,8 @@ var native_cursors := false:
set(value): set(value):
if value == native_cursors: if value == native_cursors:
return return
if DisplayServer.get_name() == "headless":
return
native_cursors = value native_cursors = value
if native_cursors: if native_cursors:
Input.set_custom_mouse_cursor(null, Input.CURSOR_CROSS, Vector2(15, 15)) Input.set_custom_mouse_cursor(null, Input.CURSOR_CROSS, Vector2(15, 15))

14
src/Main.gd
View file

@ -238,6 +238,8 @@ func _handle_layout_files() -> void:
func _setup_application_window_size() -> void: func _setup_application_window_size() -> void:
if DisplayServer.get_name() == "headless":
return
var root := get_tree().root var root := get_tree().root
root.content_scale_aspect = Window.CONTENT_SCALE_ASPECT_IGNORE root.content_scale_aspect = Window.CONTENT_SCALE_ASPECT_IGNORE
root.content_scale_mode = Window.CONTENT_SCALE_MODE_DISABLED root.content_scale_mode = Window.CONTENT_SCALE_MODE_DISABLED
@ -271,7 +273,6 @@ func _setup_application_window_size() -> void:
func set_custom_cursor() -> void: func set_custom_cursor() -> void:
if Global.native_cursors: if Global.native_cursors:
return return
if Global.shrink == 1.0: if Global.shrink == 1.0:
Input.set_custom_mouse_cursor(cursor_image, Input.CURSOR_CROSS, Vector2(15, 15)) Input.set_custom_mouse_cursor(cursor_image, Input.CURSOR_CROSS, Vector2(15, 15))
else: else:
@ -543,6 +544,12 @@ func _clear_backup_files() -> void:
func _exit_tree() -> 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", "layout", Global.layouts.find(main_ui.layout))
Global.config_cache.set_value("window", "screen", get_window().current_screen) Global.config_cache.set_value("window", "screen", get_window().current_screen)
Global.config_cache.set_value( Global.config_cache.set_value(
@ -564,8 +571,3 @@ func _exit_tree() -> void:
Global.config_cache.set_value("view_menu", "show_guides", Global.show_guides) 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.set_value("view_menu", "show_mouse_guides", Global.show_mouse_guides)
Global.config_cache.save("user://cache.ini") 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()