godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-05 06:11:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

More fill modes for containers, closes #9504

Browse Source
This commit is contained in:
Juan Linietsky
2017-07-06 19:06:55 -03:00
parent bd9d98c172
commit 7c679dd830
3 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scene/gui/container.cpp
View File

@@ -95,13 +95,25 @@ void Container::fit_child_in_rect(Control *p_child, const Rect2 &p_rect) {
Rect2 r = p_rect;
if (!(p_child->get_h_size_flags() & SIZE_FILL)) {
r.size.x = minsize.x;
r.position.x += Math::floor((p_rect.size.x - minsize.x) / 2);
r.size.x = minsize.width;
if (p_child->get_h_size_flags() & SIZE_SHRINK_END) {
r.position.x += p_rect.size.width - minsize.width;
} else if (p_child->get_h_size_flags() & SIZE_SHRINK_CENTER) {
r.position.x += Math::floor((p_rect.size.x - minsize.width) / 2);
} else {
r.position.x += 0;
}
}
if (!(p_child->get_v_size_flags() & SIZE_FILL)) {
r.size.y = minsize.y;
r.position.y += Math::floor((p_rect.size.y - minsize.y) / 2);
if (p_child->get_v_size_flags() & SIZE_SHRINK_END) {
r.position.y += p_rect.size.height - minsize.height;
} else if (p_child->get_v_size_flags() & SIZE_SHRINK_CENTER) {
r.position.y += Math::floor((p_rect.size.y - minsize.height) / 2);
} else {
r.position.y += 0;
}
}
for (int i = 0; i < 4; i++)