From fdd1833bd761f543b0bcfa310a0f342a114db6e6 Mon Sep 17 00:00:00 2001 From: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com> Date: Tue, 13 Oct 2020 14:24:37 +0300 Subject: [PATCH] Call text_to_pixels() when clicking again, instead of enter Newline still does not work though --- project.godot | 5 ----- src/Tools/Text.gd | 13 +++++++------ 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/project.godot b/project.godot index 06f678d..57c41bd 100644 --- a/project.godot +++ b/project.godot @@ -429,11 +429,6 @@ cut={ "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":true,"meta":false,"command":true,"pressed":false,"scancode":88,"unicode":0,"echo":false,"script":null) ] } -enter={ -"deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777221,"unicode":0,"echo":false,"script":null) - ] -} [locale] diff --git a/src/Tools/Text.gd b/src/Tools/Text.gd index 0f52231..0f2d543 100644 --- a/src/Tools/Text.gd +++ b/src/Tools/Text.gd @@ -14,14 +14,10 @@ func _ready() -> void: font.size = text_size -func _input(event : InputEvent) -> void: - if event.is_action_pressed("enter"): - text_to_pixels() - - func draw_start(position : Vector2) -> void: if text_edit: - return + text_to_pixels() + text_edit = TextEdit.new() text_edit.text = "" text_edit.rect_position = get_viewport().get_mouse_position() @@ -41,6 +37,11 @@ func draw_end(_position : Vector2) -> void: func text_to_pixels() -> void: if !text_edit: return + if !text_edit.text: + text_edit.queue_free() + text_edit = null + return + var project : Project = Global.current_project var size : Vector2 = project.size var current_cel = project.frames[project.current_frame].cels[project.current_layer].image