huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-02-28 16:33:15 +00:00
Code Issues Wiki Activity

Properly fix the palette panel initialization issue

Browse source 
And remove the hacky way. The issue is that the swatches were being created and then queue_freed at the end of the frame and not immediately.
This commit is contained in:
Manolis Papadeas 2022-02-03 19:57:53 +02:00
parent f96879012d
commit ad9d8cfdbc
3 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Main.gd
View file

@ -72,12 +72,6 @@ func _ready() -> void:
_show_splash_screen() _show_splash_screen()
# Hacky way to update the panel's size... Unsure why this happens.
yield(get_tree(), "idle_frame")
ui.set_control_hidden(Global.palette_panel, true)
yield(get_tree(), "idle_frame")
ui.set_control_hidden(Global.palette_panel, false)
func _input(event: InputEvent) -> void: func _input(event: InputEvent) -> void:
Global.left_cursor.position = get_global_mouse_position() + Vector2(-32, 32) Global.left_cursor.position = get_global_mouse_position() + Vector2(-32, 32)

1
src/Palette/PaletteGrid.gd
View file

@ -94,6 +94,7 @@ func scroll_palette(origin: Vector2) -> void:
func clear_swatches() -> void: func clear_swatches() -> void:
swatches.clear() swatches.clear()
for swatch in get_children(): for swatch in get_children():
remove_child(swatch) # To remove the child immediately and not at the end of the frame
swatch.queue_free() swatch.queue_free()

6
src/Palette/PalettePanel.tscn
View file

@ -9,8 +9,8 @@
[ext_resource path="res://src/Palette/PalettePanel.gd" type="Script" id=8] [ext_resource path="res://src/Palette/PalettePanel.gd" type="Script" id=8]
[node name="PalettePanel" type="PanelContainer"] [node name="PalettePanel" type="PanelContainer"]
margin_right = 300.0 margin_right = 318.0
margin_bottom = 319.0 margin_bottom = 118.0
rect_min_size = Vector2( 318, 0 ) rect_min_size = Vector2( 318, 0 )
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 0 size_flags_vertical = 0
@ -23,7 +23,7 @@ __meta__ = {
margin_left = 7.0 margin_left = 7.0
margin_top = 7.0 margin_top = 7.0
margin_right = 311.0 margin_right = 311.0
margin_bottom = 312.0 margin_bottom = 111.0
size_flags_horizontal = 3 size_flags_horizontal = 3
[node name="PalettesLabel" type="Label" parent="PaletteVBoxContainer"] [node name="PalettesLabel" type="Label" parent="PaletteVBoxContainer"]