huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-02-07 10:59:49 +00:00
Code Issues Wiki Activity

Fixed issues when removing a palette color in EditPalettePopup

Browse source 
Also updated _on_AddSwatchButton_pressed() to pass the button itself instead of its index, on new_button.connect()
This commit is contained in:
OverloadedOrama 2019-12-26 02:28:47 +02:00
parent 9b73e4f661
commit f0feb2f024
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
Scripts/Palette/EditPalettePopup.gd
View file

@ -39,9 +39,7 @@ func _display_palette() -> void:
index += 1 index += 1
if index > 0: # If there are colors, select the first if index > 0: # If there are colors, select the first
current_swatch = 0 on_swatch_select(palette_grid.get_child(0))
color_name_edit.text = working_palette.get_color_name(0)
color_picker.color = working_palette.get_color(0)
func _clear_swatches() -> void: func _clear_swatches() -> void:
for child in palette_grid.get_children(): for child in palette_grid.get_children():
@ -60,11 +58,7 @@ func on_move_swatch(from : int, to : int) -> void:
palette_grid.move_child(palette_grid.get_child(from), to) palette_grid.move_child(palette_grid.get_child(from), to)
current_swatch = to current_swatch = to
# Re-index swatches with new order re_index_swatches()
var index := 0
for child in palette_grid.get_children():
child.index = index
index += 1
func _on_AddSwatchButton_pressed() -> void: func _on_AddSwatchButton_pressed() -> void:
var color : Color = color_picker.color var color : Color = color_picker.color
@ -80,13 +74,26 @@ func _on_AddSwatchButton_pressed() -> void:
var index : int = palette_grid.get_child_count() var index : int = palette_grid.get_child_count()
new_button.index = index new_button.index = index
new_button.connect("on_drop_data", self, "on_move_swatch") new_button.connect("on_drop_data", self, "on_move_swatch")
new_button.connect("pressed", self, "on_swatch_select", [index]) new_button.connect("pressed", self, "on_swatch_select", [new_button])
palette_grid.add_child(new_button) palette_grid.add_child(new_button)
func _on_RemoveSwatchButton_pressed() -> void: func _on_RemoveSwatchButton_pressed() -> void:
working_palette.remove_color(current_swatch) working_palette.remove_color(current_swatch)
palette_grid.remove_child(palette_grid.get_child(current_swatch)) palette_grid.remove_child(palette_grid.get_child(current_swatch))
re_index_swatches()
if working_palette.colors.size() > 0:
if current_swatch == working_palette.colors.size():
current_swatch -= 1
on_swatch_select(palette_grid.get_child(current_swatch))
func re_index_swatches() -> void:
# Re-index swatches with new order
var index := 0
for child in palette_grid.get_children():
child.index = index
index += 1
func _on_EditPaletteSaveButton_pressed() -> void: func _on_EditPaletteSaveButton_pressed() -> void:
Global.palettes[current_palette] = working_palette Global.palettes[current_palette] = working_palette