From ad3886d48415788ec7ddc660595888517fc9536a Mon Sep 17 00:00:00 2001 From: Vaillant Jeremy Date: Sat, 15 May 2021 01:20:47 +0200 Subject: [PATCH] Add margin container --- scenes/UI/choose_scenes/ChooseScene.gd | 26 +++++++++++++++++++----- scenes/UI/choose_scenes/ChooseScene.tscn | 2 ++ 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/scenes/UI/choose_scenes/ChooseScene.gd b/scenes/UI/choose_scenes/ChooseScene.gd index 9f22dc8..1efe1d1 100644 --- a/scenes/UI/choose_scenes/ChooseScene.gd +++ b/scenes/UI/choose_scenes/ChooseScene.gd @@ -51,9 +51,24 @@ func _get_resource(index, table, datas): return datas[index].get_data() func _apply_scene(name, thumb, resource): - $MarginContainer/HBoxContainer.add_child(_configure_vbox()) - _configure_button(thumb, resource, name) - $MarginContainer/HBoxContainer/VBoxContainer.add_child(_configure_label(name)) + $MarginContainer/HBoxContainer.add_child(_configure_margin_container()) + _configure_button(thumb, $MarginContainer/HBoxContainer/MarginContainer, name) + $MarginContainer/HBoxContainer/MarginContainer.add_child(_configure_vbox()) + $MarginContainer/HBoxContainer/MarginContainer/VBoxContainer.add_child(_configure_hbox()) + $MarginContainer/HBoxContainer/MarginContainer/VBoxContainer/HBoxContainer.add_child(_configure_label("reset")) + $MarginContainer/HBoxContainer/MarginContainer/VBoxContainer/HBoxContainer.add_child(_configure_label("0 / 10")) + +func _configure_margin_container(): + var margin = MarginContainer.new() + margin.set_name("MarginContainer") + + return margin + +func _configure_hbox(): + var hbox = HBoxContainer.new() + hbox.set_name("HBoxContainer") + + return hbox func _configure_vbox(): var vbox = VBoxContainer.new() @@ -67,8 +82,9 @@ func _configure_label(name): return label -func _configure_button(thumb, _resource, name): +func _configure_button(thumb, parent, name): var thumbnail = TextureButton.new() - $MarginContainer/HBoxContainer/VBoxContainer.add_child(thumbnail) + parent.add_child(thumbnail) + # $MarginContainer/HBoxContainer/VBoxContainer.add_child(thumbnail) thumbnail.set_normal_texture(load(thumb)) thumbnail.connect("pressed", self, "_on_"+name.to_lower()+"_pressed") diff --git a/scenes/UI/choose_scenes/ChooseScene.tscn b/scenes/UI/choose_scenes/ChooseScene.tscn index 645f4bb..766ed52 100644 --- a/scenes/UI/choose_scenes/ChooseScene.tscn +++ b/scenes/UI/choose_scenes/ChooseScene.tscn @@ -27,3 +27,5 @@ __meta__ = { [node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer"] margin_top = 15.0 margin_bottom = 15.0 +size_flags_horizontal = 3 +size_flags_vertical = 3