godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 10:11:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Don't emit changed signal on Color Picker close

Browse Source 
(cherry picked from commit a22b2f86e7)
This commit is contained in:
kobewi
2021-01-03 18:12:00 +01:00
committed by Rémi Verschelde
parent 90d1d580af
commit f78937a394
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
editor/editor_properties.cpp
View File

@@ -1917,11 +1917,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");
@@ -1934,7 +1929,6 @@ void EditorPropertyColor::_picker_created() {
void EditorPropertyColor::_bind_methods() { void EditorPropertyColor::_bind_methods() {
ClassDB::bind_method(D_METHOD("_color_changed"), &EditorPropertyColor::_color_changed); 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_created"), &EditorPropertyColor::_picker_created);
} }
@@ -1970,7 +1964,6 @@ EditorPropertyColor::EditorPropertyColor() {
add_child(picker); add_child(picker);
picker->set_flat(true); picker->set_flat(true);
picker->connect("color_changed", this, "_color_changed"); picker->connect("color_changed", this, "_color_changed");
picker->connect("popup_closed", this, "_popup_closed");
picker->connect("picker_created", this, "_picker_created"); picker->connect("picker_created", this, "_picker_created");
} }

1
editor/editor_properties.h
View File

@@ -493,7 +493,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: