summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Marques <george@gmarqu.es>2016-11-14 13:46:28 -0200
committerGitHub <noreply@github.com>2016-11-14 13:46:28 -0200
commite167c664c865af3083bdd99cc1240ea2c7c8db7e (patch)
treeb20a52be66a501e2ba6c08b2a80feb462a470940
parentbbc71083c1616047e4ef571a25d254034c69ef33 (diff)
parent384625aa31a3627c25246e06c1fbc3019866765c (diff)
Merge pull request #7109 from volzhs/emit-signal-from-set
Emit "*_changed" signal in set_*
-rw-r--r--scene/gui/color_picker.cpp1
-rw-r--r--scene/gui/line_edit.cpp1
-rw-r--r--scene/gui/text_edit.cpp2
3 files changed, 3 insertions, 1 deletions
diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp
index 5e66544153..d6535ef511 100644
--- a/scene/gui/color_picker.cpp
+++ b/scene/gui/color_picker.cpp
@@ -660,6 +660,7 @@ void ColorPickerButton::set_color(const Color& p_color){
picker->set_color(p_color);
update();
+ emit_signal("color_changed",p_color);
}
Color ColorPickerButton::get_color() const{
diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp
index eecc730f5c..0b06044b7c 100644
--- a/scene/gui/line_edit.cpp
+++ b/scene/gui/line_edit.cpp
@@ -918,6 +918,7 @@ 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 871a3ca68f..c585fff2a6 100644
--- a/scene/gui/text_edit.cpp
+++ b/scene/gui/text_edit.cpp
@@ -3327,7 +3327,7 @@ void TextEdit::set_text(String p_text){
cursor_set_column(0);
update();
setting_text=false;
-
+ _text_changed_emit();
//get_range()->set(0);
};