godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-05 19:31:35 +00:00
Code Releases Wiki Activity

Merge pull request #21534 from volzhs/fix-scrollcontainer-size

Browse Source 
Precise size calculation of ScrollContainer
This commit is contained in:
Rémi Verschelde
2019-03-07 14:19:43 +01:00
committed by GitHub
parent 06dbeab5d4 f3dfa1c8b9
commit e28e849012
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scene/gui/scroll_container.cpp
View File

@@ -368,8 +368,10 @@ void ScrollContainer::update_scrollbars() {
Ref<StyleBox> sb = get_stylebox("bg");
size -= sb->get_minimum_size();
Size2 hmin = h_scroll->get_combined_minimum_size();
Size2 vmin = v_scroll->get_combined_minimum_size();
Size2 hmin;
Size2 vmin;
if (scroll_h) hmin = h_scroll->get_combined_minimum_size();
if (scroll_v) vmin = v_scroll->get_combined_minimum_size();
Size2 min = child_max_size;