Gremlinsoft
/
godot
forked from sascha/godot
2
0
Fork 0
Code Pull Requests Activity

Fix adding colors to swatches not updating in previous ColorPickers. 

ColorPicker was only updating colors if its swatches were empty. It
should always update from the cache in case some other ColorPicker
updated the swatch cache.

(cherry picked from commit a132ed0ca4)
4.0
ocean (they/them) 2023-06-29 16:03:21 +07:00 committed by Yuri Sizov
parent 0b8fee56e2
commit e75e104e2d
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scene/gui/color_picker.cpp
Unescape Escape View File

@ -561,13 +561,14 @@ void ColorPicker::_update_presets() {
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
if (editor_settings) { if (editor_settings) {
// Only load preset buttons when the only child is the add-preset button. // Rebuild swatch color buttons, keeping the add-preset button in the first position.
if (preset_container->get_child_count() == 1) { for (int i = 1; i < preset_container->get_child_count(); i++) {
for (int i = 0; i < preset_cache.size(); i++) { preset_container->get_child(i)->queue_free();
_add_preset_button(preset_size, preset_cache[i]);
}
_notification(NOTIFICATION_VISIBILITY_CHANGED);
} }
for (int i = 0; i < preset_cache.size(); i++) {
_add_preset_button(preset_size, preset_cache[i]);
}
_notification(NOTIFICATION_VISIBILITY_CHANGED);
} }
#endif #endif
} }