Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix preset cache usage in ColorPicker

Browse source
This commit is contained in:
Konrad Gadzina 2025-03-21 23:27:29 +01:00 • committed by Rémi Verschelde
parent 5f12ada7a4
commit 846ae11cd7
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

34
scene/gui/color_picker.cpp
View file

@ -170,9 +170,10 @@ void ColorPicker::_notification(int p_what) {
// Adjust for the width of the "script" icon. // Adjust for the width of the "script" icon.
text_type->set_custom_minimum_size(Size2(28 * theme_cache.base_scale, 0)); text_type->set_custom_minimum_size(Size2(28 * theme_cache.base_scale, 0));
_update_presets();
_update_recent_presets();
_update_controls(); _update_controls();
// HACK: Deferring updating presets to ensure their size is correct when creating ColorPicker at runtime.
callable_mp(this, &ColorPicker::_update_presets).call_deferred();
callable_mp(this, &ColorPicker::_update_recent_presets).call_deferred();
} break; } break;
case NOTIFICATION_WM_CLOSE_REQUEST: { case NOTIFICATION_WM_CLOSE_REQUEST: {
@ -749,10 +750,10 @@ void ColorPicker::_update_color(bool p_update_sliders) {
void ColorPicker::_update_presets() { void ColorPicker::_update_presets() {
int preset_size = _get_preset_size(); int preset_size = _get_preset_size();
btn_add_preset->set_custom_minimum_size(Size2(preset_size, preset_size));
// Only update the preset button size if it has changed. // Only update the preset button size if it has changed.
if (preset_size != prev_preset_size) { if (preset_size != prev_preset_size) {
prev_preset_size = preset_size; prev_preset_size = preset_size;
btn_add_preset->set_custom_minimum_size(Size2(preset_size, preset_size));
for (int i = 1; i < preset_container->get_child_count(); i++) { for (int i = 1; i < preset_container->get_child_count(); i++) {
ColorPresetButton *cpb = Object::cast_to<ColorPresetButton>(preset_container->get_child(i)); ColorPresetButton *cpb = Object::cast_to<ColorPresetButton>(preset_container->get_child(i));
cpb->set_custom_minimum_size(Size2(preset_size, preset_size)); cpb->set_custom_minimum_size(Size2(preset_size, preset_size));
@ -764,7 +765,10 @@ void ColorPicker::_update_presets() {
String cached_name = editor_settings->call(SNAME("get_project_metadata"), "color_picker", "palette_name", String()); String cached_name = editor_settings->call(SNAME("get_project_metadata"), "color_picker", "palette_name", String());
palette_path = editor_settings->call(SNAME("get_project_metadata"), "color_picker", "palette_path", String()); palette_path = editor_settings->call(SNAME("get_project_metadata"), "color_picker", "palette_path", String());
bool palette_edited = editor_settings->call(SNAME("get_project_metadata"), "color_picker", "palette_edited", false); bool palette_edited = editor_settings->call(SNAME("get_project_metadata"), "color_picker", "palette_edited", false);
if (!cached_name.is_empty()) { if (cached_name.is_empty()) {
palette_path = String();
palette_name->hide();
} else {
palette_name->set_text(cached_name); palette_name->set_text(cached_name);
if (btn_preset->is_pressed() && !presets.is_empty()) { if (btn_preset->is_pressed() && !presets.is_empty()) {
palette_name->show(); palette_name->show();
@ -778,14 +782,17 @@ void ColorPicker::_update_presets() {
} }
#endif #endif
// Rebuild swatch color buttons, keeping the add-preset button in the first position. if (presets_just_loaded || presets.is_empty() || Engine::get_singleton()->is_editor_hint()) {
for (int i = 1; i < preset_container->get_child_count(); i++) { // Rebuild swatch color buttons, keeping the add-preset button in the first position.
preset_container->get_child(i)->queue_free(); for (int i = 1; i < preset_container->get_child_count(); i++) {
} preset_container->get_child(i)->queue_free();
}
presets = preset_cache; presets = preset_cache;
for (const Color &preset : preset_cache) { for (const Color &preset : presets) {
_add_preset_button(preset_size, preset); _add_preset_button(preset_size, preset);
}
presets_just_loaded = false;
} }
_notification(NOTIFICATION_VISIBILITY_CHANGED); _notification(NOTIFICATION_VISIBILITY_CHANGED);
@ -956,6 +963,7 @@ void ColorPicker::_palette_file_selected(const String &p_path) {
preset_cache.push_back(saved_preset); preset_cache.push_back(saved_preset);
presets.push_back(saved_preset); presets.push_back(saved_preset);
} }
presets_just_loaded = true;
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
if (editor_settings) { if (editor_settings) {
@ -992,7 +1000,9 @@ void ColorPicker::_palette_file_selected(const String &p_path) {
editor_settings->call(SNAME("set_project_metadata"), "color_picker", "palette_edited", false); editor_settings->call(SNAME("set_project_metadata"), "color_picker", "palette_edited", false);
} }
#endif #endif
_update_presets(); if (file_dialog->get_file_mode() == FileDialog::FileMode::FILE_MODE_OPEN_FILE) {
_update_presets();
}
} }
void ColorPicker::_show_hide_preset(const bool &p_is_btn_pressed, Button *p_btn_preset, Container *p_preset_container) { void ColorPicker::_show_hide_preset(const bool &p_is_btn_pressed, Button *p_btn_preset, Container *p_preset_container) {

1
scene/gui/color_picker.h
View file

@ -212,6 +212,7 @@ private:
Button *btn_pick = nullptr; Button *btn_pick = nullptr;
Label *palette_name = nullptr; Label *palette_name = nullptr;
String palette_path; String palette_path;
bool presets_just_loaded = false;
Button *btn_preset = nullptr; Button *btn_preset = nullptr;
Button *btn_recent_preset = nullptr; Button *btn_recent_preset = nullptr;
PopupMenu *shape_popup = nullptr; PopupMenu *shape_popup = nullptr;