From 0945a558d26e20b4ddf85b72f61fb16b02beb019 Mon Sep 17 00:00:00 2001 From: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com> Date: Sat, 29 Feb 2020 01:23:45 +0200 Subject: [PATCH] Fix layer name change Name change is now saved only if the user presses Enter --- Prefabs/LayerContainer.tscn | 1 - Scripts/Global.gd | 4 +++- Scripts/LayerContainer.gd | 7 +++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Prefabs/LayerContainer.tscn b/Prefabs/LayerContainer.tscn index cc11393..b9a5d53 100644 --- a/Prefabs/LayerContainer.tscn +++ b/Prefabs/LayerContainer.tscn @@ -58,4 +58,3 @@ caret_blink = true caret_blink_speed = 0.5 [connection signal="pressed" from="." to="." method="_on_LayerContainer_pressed"] [connection signal="pressed" from="HBoxContainer/VisibilityButton" to="." method="_on_VisibilityButton_pressed"] -[connection signal="text_changed" from="HBoxContainer/LineEdit" to="." method="_on_LineEdit_text_changed"] diff --git a/Scripts/Global.gd b/Scripts/Global.gd index 795c090..8295983 100644 --- a/Scripts/Global.gd +++ b/Scripts/Global.gd @@ -537,8 +537,10 @@ func layers_changed(value : Array) -> void: for i in range(layers.size() - 1, -1, -1): var layer_container = load("res://Prefabs/LayerContainer.tscn").instance() - layers[i][0] = tr("Layer") + " %s" % i layer_container.i = i + if !layers[i][0]: + layers[i][0] = tr("Layer") + " %s" % i + layer_container.get_child(0).get_child(1).text = layers[i][0] layer_container.get_child(0).get_child(2).text = layers[i][0] layers_container.add_child(layer_container) diff --git a/Scripts/LayerContainer.gd b/Scripts/LayerContainer.gd index 79c77bb..d1e5cf1 100644 --- a/Scripts/LayerContainer.gd +++ b/Scripts/LayerContainer.gd @@ -23,6 +23,9 @@ func _input(event : InputEvent) -> void: label.visible = true line_edit.visible = false line_edit.editable = false + var new_text : String = line_edit.text + label.text = new_text + Global.layers[i][0] = new_text func _on_LayerContainer_pressed() -> void: var initially_pressed := pressed @@ -85,7 +88,3 @@ func _on_VisibilityButton_pressed() -> void: visibility_button.texture_normal = load("res://Assets/Graphics/%s Themes/Layers/Layer_Visible.png" % Global.theme_type) visibility_button.texture_hover = load("res://Assets/Graphics/%s Themes/Layers/Layer_Visible_Hover.png" % Global.theme_type) Global.canvas.update() - -func _on_LineEdit_text_changed(new_text : String) -> void: - Global.layers[i][0] = new_text - label.text = new_text