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

Don't emit changed signal on Color Picker close

This commit is contained in:
kobewi 2021-01-03 18:12:00 +01:00
parent 950dedbb68
commit a22b2f86e7
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
editor/editor_properties.cpp
View File

@ -2144,10 +2144,6 @@ void EditorPropertyColor::_color_changed(const Color &p_color) {
emit_changed(get_edited_property(), p_color, "", true); emit_changed(get_edited_property(), p_color, "", true);
} }
void EditorPropertyColor::_popup_closed() {
emit_changed(get_edited_property(), picker->get_pick_color(), "", false);
}
void EditorPropertyColor::_picker_created() { void EditorPropertyColor::_picker_created() {
// get default color picker mode from editor settings // get default color picker mode from editor settings
int default_color_mode = EDITOR_GET("interface/inspector/default_color_picker_mode"); int default_color_mode = EDITOR_GET("interface/inspector/default_color_picker_mode");
@ -2191,7 +2187,6 @@ EditorPropertyColor::EditorPropertyColor() {
add_child(picker); add_child(picker);
picker->set_flat(true); picker->set_flat(true);
picker->connect("color_changed", callable_mp(this, &EditorPropertyColor::_color_changed)); picker->connect("color_changed", callable_mp(this, &EditorPropertyColor::_color_changed));
picker->connect("popup_closed", callable_mp(this, &EditorPropertyColor::_popup_closed));
picker->connect("picker_created", callable_mp(this, &EditorPropertyColor::_picker_created)); picker->connect("picker_created", callable_mp(this, &EditorPropertyColor::_picker_created));
} }

1
editor/editor_properties.h
View File

@ -547,7 +547,6 @@ class EditorPropertyColor : public EditorProperty {
GDCLASS(EditorPropertyColor, EditorProperty); GDCLASS(EditorPropertyColor, EditorProperty);
ColorPickerButton *picker; ColorPickerButton *picker;
void _color_changed(const Color &p_color); void _color_changed(const Color &p_color);
void _popup_closed();
void _picker_created(); void _picker_created();
protected: protected: