Fix preset cache usage in ColorPicker #104496
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
FeniXb3
force-pushed
the
fix-color-palette-cache
branch
from
9c864b4 to
eb47eef
Compare
FeniXb3
force-pushed
the
fix-color-palette-cache
branch
from
eb47eef to
240861f
Compare
KoBeWi
reviewed
Mar 28, 2025
KoBeWi
reviewed
Mar 28, 2025
KoBeWi
reviewed
Mar 28, 2025
scene/gui/color_picker.cpp
Outdated
| for (int i = 1; i < preset_container->get_child_count(); i++) { | ||
| preset_container->get_child(i)->queue_free(); | ||
| } | ||
| if (presets.is_empty() || Engine::get_singleton()->is_editor_hint()) { |
There was a problem hiding this comment.
I think this points at the main problem here.
The reported issue was about standalone ColorPicker, while the preset update code assumes that the ColorPicker always comes from ColorPickerButton. I think we should always update the presets in the latter case. For that the ColorPicker needs to know whether it's standalone or from a button.
FeniXb3
force-pushed
the
fix-color-palette-cache
branch
from
240861f to
98a3ca1
Compare
KoBeWi
reviewed
Apr 1, 2025
| @@ -730,10 +731,10 @@ void ColorPicker::_update_color(bool p_update_sliders) { | |||
|
|
|||
| void ColorPicker::_update_presets() { | |||
| int preset_size = _get_preset_size(); | |||
| btn_add_preset->set_custom_minimum_size(Size2(preset_size * 1, preset_size)); | |||
There was a problem hiding this comment.
Suggested change
| btn_add_preset->set_custom_minimum_size(Size2(preset_size * 1, preset_size)); | |
| btn_add_preset->set_custom_minimum_size(Size2(preset_size, preset_size)); |
KoBeWi
reviewed
Apr 1, 2025
| @@ -170,6 +170,7 @@ class ColorPicker : public VBoxContainer { | |||
| Button *btn_pick = nullptr; | |||
| Label *palette_name = nullptr; | |||
| String palette_path; | |||
| bool presets_just_loaded; | |||
There was a problem hiding this comment.
Suggested change
| bool presets_just_loaded; | |
| bool presets_just_loaded = false; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #104223
It also fixes two additional bugs (click to expand)
ColorPickers. Video of incorrect behaviour from 4.4.stable:Nagrywanie.ekranu.2025-03-23.001706.mp4
ColorPickerin runtime. Video of incorrect behaviour from 4.4.stable:Nagrywanie.ekranu.2025-03-23.001306.mp4
Correct behaviour, fixed with this PR:
Nagrywanie.ekranu.2025-03-23.003851.mp4
Nagrywanie.ekranu.2025-03-23.004156.mp4