godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19050 from ibrahn/fix-signals-on-set 

fix for TextEdit::set_text firing signals it shouldn't.
This commit is contained in:
Juan Linietsky 2018-05-19 19:07:41 -03:00 committed by GitHub
parent 9b567cc549 2abec59db9
commit 5b11d16f21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scene/gui/line_edit.cpp
View File

@ -1005,7 +1005,6 @@ void LineEdit::set_text(String p_text) {
update(); update();
cursor_pos = 0; cursor_pos = 0;
window_pos = 0; window_pos = 0;
_text_changed();
} }
void LineEdit::clear() { void LineEdit::clear() {

4
scene/gui/text_edit.cpp
View File

@ -4110,7 +4110,7 @@ Control::CursorShape TextEdit::get_cursor_shape(const Point2 &p_pos) const {
void TextEdit::set_text(String p_text) { void TextEdit::set_text(String p_text) {
setting_text = true; setting_text = true;
clear(); _clear();
_insert_text_at_cursor(p_text); _insert_text_at_cursor(p_text);
clear_undo_history(); clear_undo_history();
cursor.column = 0; cursor.column = 0;
@ -4123,7 +4123,7 @@ void TextEdit::set_text(String p_text) {
cursor_set_column(0); cursor_set_column(0);
update(); update();
setting_text = false; setting_text = false;
_text_changed_emit();
//get_range()->set(0); //get_range()->set(0);
}; };