godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-25 15:37:42 +00:00
Code Releases Wiki Activity

Merge pull request #101913 from Giganzo/color-hide-button

Browse Source 
Fix ColorPicker hide save/load swatches for presets_visible
This commit is contained in:
Thaddeus Crews
2025-01-28 16:08:58 -06:00
parent 3c80c14092 e9b164adf7
commit 3c3ff85d33
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scene/gui/color_picker.cpp
View File

@@ -2038,8 +2038,7 @@ void ColorPicker::set_presets_visible(bool p_visible) {
return;
}
presets_visible = p_visible;
btn_preset->set_visible(p_visible);
btn_recent_preset->set_visible(p_visible);
swatches_vbc->set_visible(p_visible);
}
bool ColorPicker::are_presets_visible() const {
@@ -2348,6 +2347,9 @@ ColorPicker::ColorPicker() {
_update_controls();
updating = false;
swatches_vbc = memnew(VBoxContainer);
real_vbox->add_child(swatches_vbc);
preset_container = memnew(GridContainer);
preset_container->set_h_size_flags(SIZE_EXPAND_FILL);
preset_container->set_columns(PRESET_COLUMN_COUNT);
@@ -2357,7 +2359,7 @@ ColorPicker::ColorPicker() {
HBoxContainer *palette_box = memnew(HBoxContainer);
palette_box->set_h_size_flags(SIZE_EXPAND_FILL);
real_vbox->add_child(palette_box);
swatches_vbc->add_child(palette_box);
btn_preset = memnew(Button);
btn_preset->set_text("Swatches");
@@ -2379,9 +2381,9 @@ ColorPicker::ColorPicker() {
palette_name = memnew(Label);
palette_name->hide();
palette_name->set_mouse_filter(MOUSE_FILTER_PASS);
real_vbox->add_child(palette_name);
swatches_vbc->add_child(palette_name);
real_vbox->add_child(preset_container);
swatches_vbc->add_child(preset_container);
recent_preset_hbc = memnew(HBoxContainer);
recent_preset_hbc->set_v_size_flags(SIZE_SHRINK_BEGIN);
@@ -2395,9 +2397,9 @@ ColorPicker::ColorPicker() {
btn_recent_preset->set_focus_mode(FOCUS_NONE);
btn_recent_preset->set_text_alignment(HORIZONTAL_ALIGNMENT_LEFT);
btn_recent_preset->connect(SceneStringName(toggled), callable_mp(this, &ColorPicker::_show_hide_preset).bind(btn_recent_preset, recent_preset_hbc));
real_vbox->add_child(btn_recent_preset);
swatches_vbc->add_child(btn_recent_preset);
real_vbox->add_child(recent_preset_hbc);
swatches_vbc->add_child(recent_preset_hbc);
set_pick_color(Color(1, 1, 1));