Skip to content

Commit db6b1c0

Browse files
Fixes
1 parent 545f143 commit db6b1c0

File tree

10 files changed

+57
-25
lines changed

10 files changed

+57
-25
lines changed

assets/icons/remove.svg.import

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22

33
importer="texture"
44
type="CompressedTexture2D"
5-
uid="uid://x6jujyxw4f8r"
6-
path="res://.godot/imported/remove.svg-4d209cc049dad917abe1dad4ca8edd56.ctex"
5+
uid="uid://b2irkd31agi0x"
6+
path="res://.godot/imported/Remove.svg-d6b561eec13de9ed9a6b262ecffa42bf.ctex"
77
metadata={
88
"vram_texture": false
99
}
1010

1111
[deps]
1212

13-
source_file="res://assets/icons/remove.svg"
14-
dest_files=["res://.godot/imported/remove.svg-4d209cc049dad917abe1dad4ca8edd56.ctex"]
13+
source_file="res://assets/icons/Remove.svg"
14+
dest_files=["res://.godot/imported/Remove.svg-d6b561eec13de9ed9a6b262ecffa42bf.ctex"]
1515

1616
[params]
1717

components/ComponentNamePopup/ComponentNamePopup.gd

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@ signal canceled()
1313

1414

1515
## The EngineComponent
16-
var component: EngineComponent = null : set = set_component
16+
var _component: EngineComponent = null
1717

18-
## Auto hides this node when the name is confirmed
19-
@export var auto_hide: bool = false
18+
## Component signal connections
19+
var _component_signal_connections: Dictionary = {
20+
"name_changed": _on_component_name_changed
21+
}
2022

2123

2224
## Sets the component
2325
func set_component(p_component: EngineComponent) -> void:
24-
if is_instance_valid(component): component.name_changed.disconnect(_on_component_name_changed)
25-
26-
component = p_component
27-
$HBox/LineEdit.text = component.name
28-
29-
component.name_changed.connect(_on_component_name_changed)
26+
Utils.disconnect_signals(_component_signal_connections, _component)
27+
_component = p_component
28+
$HBox/LineEdit.text = _component.name
29+
Utils.connect_signals(_component_signal_connections, _component)
3030

3131

3232
## Takes focus
@@ -36,12 +36,7 @@ func focus() -> void:
3636

3737
## Sets the name
3838
func _set_name() -> void:
39-
if is_instance_valid(component):
40-
component.set_name($HBox/LineEdit.text)
41-
42-
if auto_hide:
43-
hide()
44-
39+
_component.set_name($HBox/LineEdit.text)
4540
component_renamed.emit($HBox/LineEdit.text)
4641

4742

@@ -58,6 +53,4 @@ func _on_confirm_pressed() -> void: _set_name()
5853
func _on_line_edit_text_submitted(new_text: String) -> void: _set_name()
5954

6055
## Called when the cancel button is pressed
61-
func _on_cancel_pressed() -> void:
62-
if auto_hide: hide()
63-
canceled.emit()
56+
func _on_cancel_pressed() -> void: canceled.emit()

components/ComponentNamePopup/ComponentNamePopup.tscn

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77

88
[node name="ComponentNamePopup" type="PanelContainer"]
99
custom_minimum_size = Vector2(200, 0)
10+
anchors_preset = 15
11+
anchor_right = 1.0
12+
anchor_bottom = 1.0
13+
grow_horizontal = 2
14+
grow_vertical = 2
1015
theme = ExtResource("1_h4ca0")
1116
script = ExtResource("2_mpv4w")
1217

components/ObjectPicker/ObjectPicker.gd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@ func _update_filter() -> void:
252252
selected_items.erase(object)
253253

254254
_update_selection_label()
255+
_create_component.set_class_filter(filter_allow_list[0] if filter_allow_list else "")
255256

256257

257258
func _create_filter_class_button(class_name_string: String) -> Button:

core/components/Universe.gd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ func _remove_fixtures(p_fixtures: Array, p_no_signal: bool = false) -> void:
192192
just_removed_fixtures.append(fixture)
193193

194194
if not p_no_signal and just_removed_fixtures:
195-
outputs_removed.emit(just_removed_fixtures)
195+
fixtures_removed.emit(just_removed_fixtures)
196196

197197

198198
## Returns all fixture on the given channel

panels/Debug/Debug.gd

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,13 @@ func _on_list_functions_pressed() -> void:
6464
set_output(output)
6565

6666

67+
## Shows an objectpicker then a ComponentNamePopup
68+
func _on_change_name_pressed() -> void:
69+
Interface.show_object_picker(ObjectPicker.SelectMode.Single, func(objects: Array):
70+
Interface.show_name_prompt(objects[0])
71+
)
72+
73+
6774
func _on_send_message_to_server_pressed() -> void:
6875
var args: Variant = str_to_var(message_args.text)
6976

panels/Debug/Debug.tscn

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,10 @@ layout_mode = 2
131131
size_flags_horizontal = 3
132132
text = "Get Component UUID"
133133

134+
[node name="ChangeName" type="Button" parent="VBoxContainer/PanelContainer/HBoxContainer/ScrollContainer/GridContainer"]
135+
layout_mode = 2
136+
text = "Change Component Name"
137+
134138
[node name="Output" type="CodeEdit" parent="VBoxContainer/PanelContainer/HBoxContainer"]
135139
layout_mode = 2
136140
size_flags_horizontal = 3
@@ -217,4 +221,5 @@ text = "Send"
217221
[connection signal="pressed" from="VBoxContainer/PanelContainer/HBoxContainer/ScrollContainer/GridContainer/GetUniqueId" to="." method="_on_get_unique_id_pressed"]
218222
[connection signal="pressed" from="VBoxContainer/PanelContainer/HBoxContainer/ScrollContainer/GridContainer/ListFunctions" to="." method="_on_list_functions_pressed"]
219223
[connection signal="pressed" from="VBoxContainer/PanelContainer/HBoxContainer/ScrollContainer/GridContainer/GetComponentUUID" to="." method="_on_get_component_uuid_pressed"]
224+
[connection signal="pressed" from="VBoxContainer/PanelContainer/HBoxContainer/ScrollContainer/GridContainer/ChangeName" to="." method="_on_change_name_pressed"]
220225
[connection signal="pressed" from="VBoxContainer/PanelContainer2/ScrollContainer/HBoxContainer/SendMessageToServer" to="." method="_on_send_message_to_server_pressed"]

panels/Functions/Functions.tscn

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ layout_mode = 2
5252
size_flags_horizontal = 4
5353
size_flags_vertical = 4
5454
theme_override_styles/panel = SubResource("StyleBoxFlat_mvpr3")
55-
auto_hide = true
5655

5756
[connection signal="add_requested" from="ItemListView" to="." method="_on_item_list_view_add_requested"]
5857
[connection signal="delete_requested" from="ItemListView" to="." method="_on_item_list_view_delete_requested"]

scripts/global/Interface.gd

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ var components: Dictionary = {
1111
"ColorSlider": load("res://components/ColorSlider/ColorSlider.tscn"),
1212
"ConfirmationBox": load("res://components/ConfirmationBox/ConfirmationBox.tscn"),
1313
"CreateComponent": load("res://components/CreateComponent/CreateComponent.tscn"),
14+
"ComponentNamePopup": load("res://components/ComponentNamePopup/ComponentNamePopup.tscn"),
1415
"NameDialogBox": load("res://components/NameDialogBox/NameDialogBox.tscn"),
1516
"DialogBoxContainer": load("res://components/DialogBoxContainer/DialogBoxContainer.tscn"),
1617
"CueItem": load("res://components/CueItem/CueItem.tscn"),
@@ -144,6 +145,9 @@ var _create_component_popup: CreateComponent
144145
## The CreateComponent popup promise callback
145146
var _create_component_promise: Promise = Promise.new()
146147

148+
## The NamePickerComponent popup
149+
var _name_popup: NamePickerComponent
150+
147151
## The container that stores all dialog boxes
148152
var _dialog_box_container: DialogBoxContainer
149153

@@ -181,6 +185,7 @@ func _set_up_custom_pickers():
181185
_set_up_object_picker()
182186
_set_up_panel_picker()
183187
_set_up_create_component()
188+
_set_up_name_popup()
184189
_set_up_dialog_box_container()
185190

186191

@@ -262,6 +267,17 @@ func _set_up_create_component() -> void:
262267
add_custom_popup(_create_component_popup)
263268

264269

270+
## Sets up the component name popup
271+
func _set_up_name_popup() -> void:
272+
_name_popup = components.ComponentNamePopup.instantiate()
273+
_name_popup.set_anchors_preset(Control.PRESET_CENTER)
274+
275+
_name_popup.component_renamed.connect(func (arg): hide_custom_popup(_name_popup))
276+
_name_popup.canceled.connect(hide_custom_popup.bind(_name_popup))
277+
278+
add_custom_popup(_name_popup)
279+
280+
265281
## Sets up the dialog box container
266282
func _set_up_dialog_box_container() -> void:
267283
_dialog_box_container = components.DialogBoxContainer.instantiate()
@@ -308,6 +324,12 @@ func show_create_component(mode: CreateComponent.Mode, class_filter: String) ->
308324
return _create_component_promise
309325

310326

327+
## Shows the ComponentNamePopup
328+
func show_name_prompt(for_component: EngineComponent) -> void:
329+
_name_popup.set_component(for_component)
330+
show_custom_popup(_name_popup)
331+
332+
311333
## Shows the panel picker
312334
func show_panel_picker() -> Promise:
313335
_panel_picker_promise.clear()

scripts/ui/Main.gd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ func _reload_quick_access() -> void:
7777
var new_panel: UIPanel = config.panel.instantiate()
7878

7979
new_panel.hide()
80-
8180
get_tree().process_frame.connect(func ():
81+
config.size = config.size if config.size != Vector2.ZERO else new_panel.get_combined_minimum_size()
8282
new_panel.set_anchors_preset(Control.PRESET_CENTER)
8383
new_panel.size = config.size
8484
new_panel.position = (size / 2) - (config.size / 2)

0 commit comments

Comments
 (0)