Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-01-23 17:47:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

PaintProjectPropertyInspector now updates if the preset or the current color changes in PaintProject.

Browse Source
This commit is contained in:
Relintai 2022-11-18 12:26:36 +01:00
parent 12193b03f4
commit 65cf1c60d9
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
modules/paint/ui/property_inspectors/paint_project_property_inspector.cpp
View File

@ -82,6 +82,9 @@ void PaintProjectPropertyInspector::_on_paint_node_selected(Node *p_paint_node)
return; return;
} }
proj->connect("current_color_changed", this, "_on_project_color_changed");
proj->connect("color_presets_changed", this, "_on_project_color_preset_changed");
_current_paint_project = proj->get_instance_id(); _current_paint_project = proj->get_instance_id();
_main_color_button->set_pick_color(proj->get_current_color()); _main_color_button->set_pick_color(proj->get_current_color());
@ -98,9 +101,8 @@ void PaintProjectPropertyInspector::_on_grid_color_button_changed(const Color &c
_ignore_preset_changed_event = true; _ignore_preset_changed_event = true;
int color_index = button->get_meta("color_index"); int color_index = button->get_meta("color_index");
proj->set_preset_color(color_index, color); proj->set_preset_color(color_index, color);
_ignore_preset_changed_event = false; _ignore_preset_changed_event = false;
} }
} }
@ -121,14 +123,18 @@ void PaintProjectPropertyInspector::_on_main_color_changed(const Color &color) {
PaintProject *proj = Object::cast_to<PaintProject>(ObjectDB::get_instance(_current_paint_project)); PaintProject *proj = Object::cast_to<PaintProject>(ObjectDB::get_instance(_current_paint_project));
if (proj) { if (proj) {
_ignore_color_event = true;
proj->set_current_color(_main_color_button->get_pick_color()); proj->set_current_color(_main_color_button->get_pick_color());
_ignore_color_event = false;
} }
} }
void PaintProjectPropertyInspector::_on_main_color_selected() { void PaintProjectPropertyInspector::_on_main_color_selected() {
PaintProject *proj = Object::cast_to<PaintProject>(ObjectDB::get_instance(_current_paint_project)); PaintProject *proj = Object::cast_to<PaintProject>(ObjectDB::get_instance(_current_paint_project));
if (proj) { if (proj) {
_ignore_color_event = true;
proj->set_current_color(_main_color_button->get_pick_color()); proj->set_current_color(_main_color_button->get_pick_color());
_ignore_color_event = false;
} }
} }
@ -157,10 +163,19 @@ void PaintProjectPropertyInspector::_on_project_color_preset_changed() {
} }
} }
void PaintProjectPropertyInspector::_on_project_color_changed(const Color &color) {
if (_ignore_color_event) {
return;
}
_main_color_button->set_pick_color(color);
}
PaintProjectPropertyInspector::PaintProjectPropertyInspector() { PaintProjectPropertyInspector::PaintProjectPropertyInspector() {
_current_paint_node = 0; _current_paint_node = 0;
_current_paint_project = 0; _current_paint_project = 0;
_ignore_preset_changed_event = false; _ignore_preset_changed_event = false;
_ignore_color_event = false;
VBoxContainer *main_container = memnew(VBoxContainer); VBoxContainer *main_container = memnew(VBoxContainer);
add_child(main_container); add_child(main_container);
@ -209,4 +224,7 @@ void PaintProjectPropertyInspector::_bind_methods() {
ClassDB::bind_method(D_METHOD("_on_main_color_selected"), &PaintProjectPropertyInspector::_on_main_color_selected); ClassDB::bind_method(D_METHOD("_on_main_color_selected"), &PaintProjectPropertyInspector::_on_main_color_selected);
ClassDB::bind_method(D_METHOD("_on_add_color_button_pressed"), &PaintProjectPropertyInspector::_on_add_color_button_pressed); ClassDB::bind_method(D_METHOD("_on_add_color_button_pressed"), &PaintProjectPropertyInspector::_on_add_color_button_pressed);
ClassDB::bind_method(D_METHOD("_on_project_color_changed"), &PaintProjectPropertyInspector::_on_project_color_changed);
ClassDB::bind_method(D_METHOD("_on_project_color_preset_changed"), &PaintProjectPropertyInspector::_on_project_color_preset_changed);
} }

2
modules/paint/ui/property_inspectors/paint_project_property_inspector.h
View File

@ -53,6 +53,7 @@ protected:
void _on_main_color_changed(const Color &color); void _on_main_color_changed(const Color &color);
void _on_main_color_selected(); void _on_main_color_selected();
void _on_add_color_button_pressed(); void _on_add_color_button_pressed();
void _on_project_color_changed(const Color &color);
void _on_project_color_preset_changed(); void _on_project_color_preset_changed();
void _notification(int p_what); void _notification(int p_what);
@ -67,6 +68,7 @@ protected:
ObjectID _current_paint_project; ObjectID _current_paint_project;
bool _ignore_preset_changed_event; bool _ignore_preset_changed_event;
bool _ignore_color_event;
}; };
#endif #endif