diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-03-24 01:14:51 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-03-24 01:14:51 +0100 |
| commit | cd4e4c0fccfdbfe04d91617a1bc6c4785dd6a1ec (patch) | |
| tree | d675bc1f5eaaf3a69a6eb9c2bb7ec254e90f3b10 /scene/gui/aspect_ratio_container.cpp | |
| parent | 33cca7c65c5c3b02ffdbecfd916e27fa6bc41eb5 (diff) | |
| parent | 79ba22a73f238ebd110fc5f3744c3c12a9a59475 (diff) | |
| download | redot-engine-cd4e4c0fccfdbfe04d91617a1bc6c4785dd6a1ec.tar.gz | |
Merge pull request #89111 from AThousandShips/vec_use
Use `Vector*` component-wise `min/max/clamp` functions where applicable
Diffstat (limited to 'scene/gui/aspect_ratio_container.cpp')
| -rw-r--r-- | scene/gui/aspect_ratio_container.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/scene/gui/aspect_ratio_container.cpp b/scene/gui/aspect_ratio_container.cpp index 94240ccead..711dd13781 100644 --- a/scene/gui/aspect_ratio_container.cpp +++ b/scene/gui/aspect_ratio_container.cpp @@ -46,8 +46,7 @@ Size2 AspectRatioContainer::get_minimum_size() const { continue; } Size2 minsize = c->get_combined_minimum_size(); - ms.width = MAX(ms.width, minsize.width); - ms.height = MAX(ms.height, minsize.height); + ms = ms.max(minsize); } return ms; } @@ -144,8 +143,7 @@ void AspectRatioContainer::_notification(int p_what) { } break; } child_size *= scale_factor; - child_size.x = MAX(child_size.x, child_minsize.x); - child_size.y = MAX(child_size.y, child_minsize.y); + child_size = child_size.max(child_minsize); float align_x = 0.5; switch (alignment_horizontal) { |