From 6ce640fce21be327c1d145337a1d1f02840b3e7e Mon Sep 17 00:00:00 2001 From: LunarAkai Date: Thu, 3 Jul 2025 01:53:41 +0200 Subject: [PATCH] fix: adding entries should work properly now --- src/Singletons/signal_bus.gd | 2 ++ src/UI/buttons/container_selection_button.gd | 3 ++- src/UI/done_box.gd | 1 - src/UI/ui_manager.gd | 5 ++++- src/UI/windows/edit_collection_name_window.gd | 16 +++++++++++----- src/UI/windows/editmenu.gd | 2 ++ 6 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/Singletons/signal_bus.gd b/src/Singletons/signal_bus.gd index 3479278..ab7c093 100644 --- a/src/Singletons/signal_bus.gd +++ b/src/Singletons/signal_bus.gd @@ -10,6 +10,8 @@ signal edit_window_closed signal edit_window_requested(window: Window, text: String, node: Node) signal edit_window_text_saved(window: Window, text: String, node: Node) +signal emit_id(id: int) + signal main_panel_color_changed(color: Color) signal main_window_color_changed(color: Color) signal side_panel_color_changed(color: Color) diff --git a/src/UI/buttons/container_selection_button.gd b/src/UI/buttons/container_selection_button.gd index 949c3df..fd44ae5 100644 --- a/src/UI/buttons/container_selection_button.gd +++ b/src/UI/buttons/container_selection_button.gd @@ -38,7 +38,8 @@ func _on_popup_menu_index_pressed(index: int) -> void: if index == 0: instantiated_menu = edit_collection_name_window.instantiate() add_child(instantiated_menu) - SignalBus.edit_window_requested.emit(instantiated_menu, button.text, button_index) + SignalBus.edit_window_requested.emit(instantiated_menu, button.text, self) + SignalBus.emit_id.emit(button_index) func _on_window_closed(window: Window) -> void: diff --git a/src/UI/done_box.gd b/src/UI/done_box.gd index 972bf8c..1b0b86f 100644 --- a/src/UI/done_box.gd +++ b/src/UI/done_box.gd @@ -37,5 +37,4 @@ func on_edit_window_closed(window: Window) -> void: if not is_instance_of(window, Editmenu): return if instantiated_menu != null: - SignalBus.on_entry_deleted.emit(self) instantiated_menu.queue_free() diff --git a/src/UI/ui_manager.gd b/src/UI/ui_manager.gd index 6371a02..c1de510 100644 --- a/src/UI/ui_manager.gd +++ b/src/UI/ui_manager.gd @@ -62,15 +62,18 @@ func _on_new_container_requested() -> void: container_collection_box.move_child(new_button, -2) func _on_edit_window_text_saved(window: Window, text: String, node: Node) -> void: + print("save: ", text) if is_instance_of(window, EditCollectionNameWindow): var i: int = container_selection_buttons.find(node) container_selection_buttons[i].button.text = text - rename_container_text_box_when_button_is_renamed(node) + rename_container_text_box_when_button_is_renamed(i) elif is_instance_of(window, Editmenu): for panel in panel_array: if panel.done_boxes.has(node): var i: int = panel.done_boxes.find(node) panel.done_boxes[i].entry_text_box.text = text + else: + print("Else") func rename_container_text_box_when_button_is_renamed(id) -> void: panel_array[id].container_name_label.text = container_selection_buttons[id].button.text diff --git a/src/UI/windows/edit_collection_name_window.gd b/src/UI/windows/edit_collection_name_window.gd index 07acd21..f3cb217 100644 --- a/src/UI/windows/edit_collection_name_window.gd +++ b/src/UI/windows/edit_collection_name_window.gd @@ -2,12 +2,13 @@ class_name EditCollectionNameWindow extends Window @export var text_edit: LineEdit -var id: Node +var node: Node +var id: int # Called when the node enters the scene tree for the first time. func _ready() -> void: SignalBus.edit_window_requested.connect(on_edit_window_requested) - + SignalBus.emit_id.connect(_on_id_emitted) # Called every frame. 'delta' is the elapsed time since the previous frame. @@ -20,15 +21,16 @@ func cancel() -> void: func save() -> void: - SignalBus.edit_window_text_saved.emit(self, text_edit.text, id) + SignalBus.edit_window_text_saved.emit(self, text_edit.text, node) SignalBus.on_window_closed.emit(self) -func on_edit_window_requested(window: Window, text: String, edit_id: Node) -> void: +func on_edit_window_requested(window: Window, text: String, _node: Node) -> void: if not is_instance_of(window, EditCollectionNameWindow): return + print(text) text_edit.text = text - id = edit_id + node = _node func _on_cancel_button_pressed() -> void: @@ -36,3 +38,7 @@ func _on_cancel_button_pressed() -> void: func _on_save_button_pressed() -> void: save() + + +func _on_id_emitted(_id: int) -> void: + id = _id \ No newline at end of file diff --git a/src/UI/windows/editmenu.gd b/src/UI/windows/editmenu.gd index e59b32a..c0e5ba4 100644 --- a/src/UI/windows/editmenu.gd +++ b/src/UI/windows/editmenu.gd @@ -20,6 +20,7 @@ func _on_close_requested() -> void: func on_edit_window_requested(window: Window, text: String, _node: Node) -> void: if not is_instance_of(window, Editmenu): return + print(text) node = _node text_edit.text = text @@ -42,6 +43,7 @@ func cancel() -> void: func save() -> void: SignalBus.edit_window_text_saved.emit(self, text_edit.text, node) + print(text_edit.text) SignalBus.on_window_closed.emit(self)