summaryrefslogtreecommitdiffstats
path: root/scene/gui/check_box.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2024-03-24 01:14:51 +0100
committerRémi Verschelde <rverschelde@gmail.com>2024-03-24 01:14:51 +0100
commitcd4e4c0fccfdbfe04d91617a1bc6c4785dd6a1ec (patch)
treed675bc1f5eaaf3a69a6eb9c2bb7ec254e90f3b10 /scene/gui/check_box.cpp
parent33cca7c65c5c3b02ffdbecfd916e27fa6bc41eb5 (diff)
parent79ba22a73f238ebd110fc5f3744c3c12a9a59475 (diff)
downloadredot-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/check_box.cpp')
-rw-r--r--scene/gui/check_box.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/scene/gui/check_box.cpp b/scene/gui/check_box.cpp
index 46c20e4a1c..af6696834e 100644
--- a/scene/gui/check_box.cpp
+++ b/scene/gui/check_box.cpp
@@ -36,28 +36,28 @@
Size2 CheckBox::get_icon_size() const {
Size2 tex_size = Size2(0, 0);
if (!theme_cache.checked.is_null()) {
- tex_size = Size2(theme_cache.checked->get_width(), theme_cache.checked->get_height());
+ tex_size = theme_cache.checked->get_size();
}
if (!theme_cache.unchecked.is_null()) {
- tex_size = Size2(MAX(tex_size.width, theme_cache.unchecked->get_width()), MAX(tex_size.height, theme_cache.unchecked->get_height()));
+ tex_size = tex_size.max(theme_cache.unchecked->get_size());
}
if (!theme_cache.radio_checked.is_null()) {
- tex_size = Size2(MAX(tex_size.width, theme_cache.radio_checked->get_width()), MAX(tex_size.height, theme_cache.radio_checked->get_height()));
+ tex_size = tex_size.max(theme_cache.radio_checked->get_size());
}
if (!theme_cache.radio_unchecked.is_null()) {
- tex_size = Size2(MAX(tex_size.width, theme_cache.radio_unchecked->get_width()), MAX(tex_size.height, theme_cache.radio_unchecked->get_height()));
+ tex_size = tex_size.max(theme_cache.radio_unchecked->get_size());
}
if (!theme_cache.checked_disabled.is_null()) {
- tex_size = Size2(MAX(tex_size.width, theme_cache.checked_disabled->get_width()), MAX(tex_size.height, theme_cache.checked_disabled->get_height()));
+ tex_size = tex_size.max(theme_cache.checked_disabled->get_size());
}
if (!theme_cache.unchecked_disabled.is_null()) {
- tex_size = Size2(MAX(tex_size.width, theme_cache.unchecked_disabled->get_width()), MAX(tex_size.height, theme_cache.unchecked_disabled->get_height()));
+ tex_size = tex_size.max(theme_cache.unchecked_disabled->get_size());
}
if (!theme_cache.radio_checked_disabled.is_null()) {
- tex_size = Size2(MAX(tex_size.width, theme_cache.radio_checked_disabled->get_width()), MAX(tex_size.height, theme_cache.radio_checked_disabled->get_height()));
+ tex_size = tex_size.max(theme_cache.radio_checked_disabled->get_size());
}
if (!theme_cache.radio_unchecked_disabled.is_null()) {
- tex_size = Size2(MAX(tex_size.width, theme_cache.radio_unchecked_disabled->get_width()), MAX(tex_size.height, theme_cache.radio_unchecked_disabled->get_height()));
+ tex_size = tex_size.max(theme_cache.radio_unchecked_disabled->get_size());
}
return tex_size;
}