godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #101957 from arkology/texture-progress-minimum-size 

`TextureProgressBar` minimum size selection as maximum among all textures
This commit is contained in:
Thaddeus Crews 2025-01-24 09:05:39 -06:00
parent 0d7af5b0cb 046793b260
commit a5015ca8f6
No known key found for this signature in database
GPG Key ID: 62181B86FE9E5D84
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scene/gui/texture_progress_bar.cpp
View File

@ -81,15 +81,19 @@ bool TextureProgressBar::get_nine_patch_stretch() const {
Size2 TextureProgressBar::get_minimum_size() const {
if (nine_patch_stretch) {
return Size2(stretch_margin[SIDE_LEFT] + stretch_margin[SIDE_RIGHT], stretch_margin[SIDE_TOP] + stretch_margin[SIDE_BOTTOM]);
} else if (under.is_valid()) {
return under->get_size();
} else if (over.is_valid()) {
return over->get_size();
} else if (progress.is_valid()) {
return progress->get_size();
}
return Size2(1, 1);
Size2 size = Size2(1, 1);
if (under.is_valid()) {
size = size.max(under->get_size());
}
if (progress.is_valid()) {
size = size.max(progress->get_size());
}
if (over.is_valid()) {
size = size.max(over->get_size());
}
return size;
}
void TextureProgressBar::set_progress_texture(const Ref<Texture2D> &p_texture) {