Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Use Vector* component-wise min/max/clamp functions where applicable

Browse source
This commit is contained in:
A Thousand Ships 2024-03-03 12:49:08 +01:00
parent fe01776f05
commit 79ba22a73f
No known key found for this signature in database
GPG key ID: 2033189A662F8BD7
53 changed files with 95 additions and 176 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scene/main/window.cpp
View file

@ -1033,8 +1033,7 @@ void Window::_update_window_size() {
}
if (embedder) {
size.x = MAX(size.x, 1);
size.y = MAX(size.y, 1);
size = size.max(Size2i(1, 1));
embedder->_sub_window_update(this);
} else if (window_id != DisplayServer::INVALID_WINDOW_ID) {
@ -1545,8 +1544,7 @@ Size2 Window::_get_contents_minimum_size() const {
Point2i pos = c->get_position();
Size2i min = c->get_combined_minimum_size();
max.x = MAX(pos.x + min.x, max.x);
max.y = MAX(pos.y + min.y, max.y);
max = max.max(pos + min);
}
}
@ -1703,7 +1701,7 @@ void Window::popup_centered_clamped(const Size2i &p_size, float p_fallback_ratio
Vector2i size_ratio = parent_rect.size * p_fallback_ratio;
Rect2i popup_rect;
popup_rect.size = Vector2i(MIN(size_ratio.x, expected_size.x), MIN(size_ratio.y, expected_size.y));
popup_rect.size = size_ratio.min(expected_size);
popup_rect.size = _clamp_window_size(popup_rect.size);
if (parent_rect != Rect2()) {