Relintai/godot-resources-as-sheets-plugin
1
0
Fork 0
mirror of https://github.com/Relintai/godot-resources-as-sheets-plugin.git synced 2025-04-29 21:57:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix error when typing on non-string cell

Browse Source
This commit is contained in:
don-tnowe 2023-09-09 18:12:58 +03:00
parent 6262940ce5
commit e123e8d08a
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/resources_spreadsheet_view/editor_view.gd
View File

@ -356,7 +356,7 @@ func _update_resources(update_rows : Array, update_row_indices : Array[int], upd
column_editor.set_value(update_cell, values[i])
if values[i] is String:
values[i] = _try_convert(values[i], column_types[update_column])
values[i] = try_convert(values[i], column_types[update_column])
if values[i] == null:
continue
@ -384,7 +384,7 @@ func _update_resources(update_rows : Array, update_row_indices : Array[int], upd
io.save_entries(rows, update_row_indices)
func _try_convert(value, type):
func try_convert(value, type):
if type == TYPE_BOOL:
# "off" displayed in lowercase, "ON" in uppercase.
return value[0] == "o"

9
addons/resources_spreadsheet_view/main_screen/selection_manager.gd
View File

@ -14,7 +14,7 @@ const EditorViewClass = preload("res://addons/resources_spreadsheet_view/editor_
@onready var editor_view : EditorViewClass = get_parent()
var edited_cells : Array = []
var edited_cells_text : Array[String] = []
var edited_cells_text : Array = []
var edit_cursor_positions : Array[int] = []
var all_cell_editors : Array = []
@ -209,9 +209,10 @@ func _add_cell_to_selection(cell : Control):
func _update_selected_cells_text():
if edited_cells_text.size() == 0:
return
var column_dtype := get_cell_column(editor_view.column_types[edited_cells[0]])
for i in edited_cells.size():
edited_cells_text[i] = str(edited_cells[i].text)
edited_cells_text[i] = editor_view.try_convert(edited_cells[i].text, column_dtype)
edit_cursor_positions[i] = edited_cells_text[i].length()
@ -245,5 +246,5 @@ func _on_inspector_property_edited(property : String):
values.resize(edited_cells.size())
values.fill(inspector_resource[property])
editor_view.call_deferred(&"set_edited_cells_values", values)
editor_view.set_edited_cells_values.call_deferred(values)
_try_open_docks(edited_cells[0])