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

Emit changed signal from Color Picker when changed

Browse Source 
(cherry picked from commit a00ac12ae9)
This commit is contained in:
kobewi 2021-01-09 14:17:33 +01:00 committed by Rémi Verschelde
parent 57416ce3ff
commit 3873a1331b
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
editor/editor_properties.cpp
View File

@ -1921,6 +1921,12 @@ void EditorPropertyColor::_color_changed(const Color &p_color) {
emit_changed(get_edited_property(), p_color, "", true);
}
void EditorPropertyColor::_popup_closed() {
if (picker->get_pick_color() != last_color) {
emit_changed(get_edited_property(), picker->get_pick_color(), "", false);
}
}
void EditorPropertyColor::_picker_created() {
// get default color picker mode from editor settings
int default_color_mode = EDITOR_GET("interface/inspector/default_color_picker_mode");
@ -1930,10 +1936,16 @@ void EditorPropertyColor::_picker_created() {
picker->get_picker()->set_raw_mode(true);
}
void EditorPropertyColor::_picker_opening() {
last_color = picker->get_pick_color();
}
void EditorPropertyColor::_bind_methods() {
ClassDB::bind_method(D_METHOD("_color_changed"), &EditorPropertyColor::_color_changed);
ClassDB::bind_method(D_METHOD("_popup_closed"), &EditorPropertyColor::_popup_closed);
ClassDB::bind_method(D_METHOD("_picker_created"), &EditorPropertyColor::_picker_created);
ClassDB::bind_method(D_METHOD("_picker_opening"), &EditorPropertyColor::_picker_opening);
}
void EditorPropertyColor::update_property() {
@ -1968,7 +1980,9 @@ EditorPropertyColor::EditorPropertyColor() {
add_child(picker);
picker->set_flat(true);
picker->connect("color_changed", this, "_color_changed");
picker->connect("popup_closed", this, "_popup_closed");
picker->connect("picker_created", this, "_picker_created");
picker->get_popup()->connect("about_to_popup", this, "_picker_opening");
}
////////////// NODE PATH //////////////////////

4
editor/editor_properties.h
View File

@ -493,7 +493,11 @@ class EditorPropertyColor : public EditorProperty {
GDCLASS(EditorPropertyColor, EditorProperty);
ColorPickerButton *picker;
void _color_changed(const Color &p_color);
void _popup_closed();
void _picker_created();
void _picker_opening();
Color last_color;
protected:
static void _bind_methods();