diff options
author | Juan Linietsky <reduzio@gmail.com> | 2018-05-19 19:07:41 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-19 19:07:41 -0300 |
commit | 5b11d16f219ff5741365cda8569297c0d39fee7a (patch) | |
tree | d6a45d8a97d11462a25bfab63de039003d9c5edd | |
parent | 9b567cc549199ef407e7f379bce400e8565d0a63 (diff) | |
parent | 2abec59db96496611bb16dd1300d9b7d3def9780 (diff) |
Merge pull request #19050 from ibrahn/fix-signals-on-set
fix for TextEdit::set_text firing signals it shouldn't.
-rw-r--r-- | scene/gui/line_edit.cpp | 1 | ||||
-rw-r--r-- | scene/gui/text_edit.cpp | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp index e57af0a4c0..2b644e7f96 100644 --- a/scene/gui/line_edit.cpp +++ b/scene/gui/line_edit.cpp @@ -1005,7 +1005,6 @@ void LineEdit::set_text(String p_text) { update(); cursor_pos = 0; window_pos = 0; - _text_changed(); } void LineEdit::clear() { diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 0c2e5980b1..55a650ff12 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -4110,7 +4110,7 @@ Control::CursorShape TextEdit::get_cursor_shape(const Point2 &p_pos) const { void TextEdit::set_text(String p_text) { setting_text = true; - clear(); + _clear(); _insert_text_at_cursor(p_text); clear_undo_history(); cursor.column = 0; @@ -4123,7 +4123,7 @@ void TextEdit::set_text(String p_text) { cursor_set_column(0); update(); setting_text = false; - _text_changed_emit(); + //get_range()->set(0); }; |