asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #45042 from KoBeWi/ok_maybe_it_changed

Browse source 
Emit changed signal from Color Picker when changed
This commit is contained in:
Rémi Verschelde 2021-01-11 13:49:22 +01:00 committed by GitHub
commit 2b1f2ac60a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
editor/editor_properties.cpp
View file

@ -2148,6 +2148,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");
@ -2158,6 +2164,10 @@ void EditorPropertyColor::_picker_created() {
}
}
void EditorPropertyColor::_picker_opening() {
last_color = picker->get_pick_color();
}
void EditorPropertyColor::_bind_methods() {
}
@ -2191,7 +2201,9 @@ EditorPropertyColor::EditorPropertyColor() {
add_child(picker);
picker->set_flat(true);
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->get_popup()->connect("about_to_popup", callable_mp(this, &EditorPropertyColor::_picker_opening));
}
////////////// NODE PATH //////////////////////

4
editor/editor_properties.h
View file

@ -547,7 +547,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();