Skip to content

Commit

Permalink
Merge pull request #142 from endlessm/improve-lineedit-input
Browse files Browse the repository at this point in the history
Parameter input: change text modification logic
  • Loading branch information
dbnicholson authored Jul 18, 2024
2 parents 3cf47d0 + 9f3f1a7 commit 7d3cea1
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ var option: bool = false
@onready var _bool_input := %BoolInput
@onready var _bool_input_option := %BoolInputOption

# Used to submit the text when losing focus:
var _last_lineedit_submitted_text: String
var _last_x_lineedit_submitted_text: String
var _last_y_lineedit_submitted_text: String


func set_raw_input(raw_input):
if option:
Expand Down Expand Up @@ -93,6 +98,10 @@ func _ready():
snap_point.block_type = block_type
snap_point.variant_type = variant_type

_last_lineedit_submitted_text = _line_edit.text
_last_x_lineedit_submitted_text = _x_line_edit.text
_last_y_lineedit_submitted_text = _y_line_edit.text

_update_visible_input()


Expand Down Expand Up @@ -126,10 +135,36 @@ func get_string() -> String:
return "%s" % input


func _on_line_edit_text_changed(new_text):
func _on_line_edit_text_submitted(new_text):
_last_lineedit_submitted_text = new_text
modified.emit()


func _on_line_edit_focus_exited():
if _last_lineedit_submitted_text != _line_edit.text:
modified.emit()


func _on_x_line_edit_text_submitted(new_text):
_last_x_lineedit_submitted_text = new_text
modified.emit()


func _on_x_line_edit_focus_exited():
if _last_x_lineedit_submitted_text != _x_line_edit.text:
modified.emit()


func _on_y_line_edit_text_submitted(new_text):
_last_y_lineedit_submitted_text = new_text
modified.emit()


func _on_y_line_edit_focus_exited():
if _last_y_lineedit_submitted_text != _y_line_edit.text:
modified.emit()


func _update_visible_input():
if snap_point.has_snapped_block():
_switch_input(null)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,14 +178,16 @@ popup/item_1/id = 1
[node name="SnapPoint" parent="." instance=ExtResource("2_6esp3")]
unique_name_in_owner = true
layout_mode = 2
mouse_filter = 2
block_type = 3
variant_type = 4

[connection signal="text_changed" from="InputSwitcher/TextInput/LineEdit" to="." method="_on_line_edit_text_changed"]
[connection signal="focus_exited" from="InputSwitcher/TextInput/LineEdit" to="." method="_on_line_edit_focus_exited"]
[connection signal="text_submitted" from="InputSwitcher/TextInput/LineEdit" to="." method="_on_line_edit_text_submitted"]
[connection signal="color_changed" from="InputSwitcher/ColorInput" to="." method="_on_color_input_color_changed"]
[connection signal="item_selected" from="InputSwitcher/OptionInput" to="." method="_on_option_input_item_selected"]
[connection signal="text_changed" from="InputSwitcher/Vector2Input/HBoxContainer/XLineEdit" to="." method="_on_line_edit_text_changed"]
[connection signal="text_changed" from="InputSwitcher/Vector2Input/HBoxContainer/YLineEdit" to="." method="_on_line_edit_text_changed"]
[connection signal="focus_exited" from="InputSwitcher/Vector2Input/HBoxContainer/XLineEdit" to="." method="_on_x_line_edit_focus_exited"]
[connection signal="text_submitted" from="InputSwitcher/Vector2Input/HBoxContainer/XLineEdit" to="." method="_on_x_line_edit_text_submitted"]
[connection signal="focus_exited" from="InputSwitcher/Vector2Input/HBoxContainer/YLineEdit" to="." method="_on_y_line_edit_focus_exited"]
[connection signal="text_submitted" from="InputSwitcher/Vector2Input/HBoxContainer/YLineEdit" to="." method="_on_y_line_edit_text_submitted"]
[connection signal="item_selected" from="InputSwitcher/BoolInput/BoolInputOption" to="." method="_on_option_input_item_selected"]
[connection signal="snapped_block_changed" from="SnapPoint" to="." method="_on_snap_point_snapped_block_changed"]

0 comments on commit 7d3cea1

Please sign in to comment.