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

Fix tileset panel updating when undoing and the wrong tilemap cel is selected

Browse source
This commit is contained in:
Emmanouil Papadeas 2024-11-25 17:45:04 +02:00
parent e84e9d46f3
commit a617039967
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/UI/TilesPanel.gd
View file

@ -40,13 +40,26 @@ func _gui_input(event: InputEvent) -> void:
get_viewport().set_input_as_handled() get_viewport().set_input_as_handled()
func set_tileset(tileset: TileSetCustom, cel: BaseCel) -> void:
if tileset == current_tileset:
return
if is_instance_valid(current_tileset) and current_tileset.updated.is_connected(_update_tileset):
current_tileset.updated.disconnect(_update_tileset)
current_tileset = tileset
if (
is_instance_valid(current_tileset)
and not current_tileset.updated.is_connected(_update_tileset)
):
current_tileset.updated.connect(_update_tileset.bind(cel))
func _on_cel_switched() -> void: func _on_cel_switched() -> void:
if Global.current_project.get_current_cel() is not CelTileMap: if Global.current_project.get_current_cel() is not CelTileMap:
set_tileset(null, null)
_clear_tile_buttons() _clear_tile_buttons()
return return
var cel := Global.current_project.get_current_cel() as CelTileMap var cel := Global.current_project.get_current_cel() as CelTileMap
if not cel.tileset.updated.is_connected(_update_tileset): set_tileset(cel.tileset, cel)
cel.tileset.updated.connect(_update_tileset.bind(cel))
_update_tileset(cel) _update_tileset(cel)
@ -55,8 +68,6 @@ func _update_tileset(cel: BaseCel) -> void:
if cel is not CelTileMap: if cel is not CelTileMap:
return return
var tilemap_cel := cel as CelTileMap var tilemap_cel := cel as CelTileMap
if tilemap_cel != Global.current_project.get_current_cel():
tilemap_cel.tileset.updated.disconnect(_update_tileset)
var tileset := tilemap_cel.tileset var tileset := tilemap_cel.tileset
var button_group := ButtonGroup.new() var button_group := ButtonGroup.new()
if selected_tile_index >= tileset.tiles.size(): if selected_tile_index >= tileset.tiles.size():