godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-22 15:06:45 +00:00
Code Releases Wiki Activity

Fix Tree overflow without scrolling being enabled

Browse Source 
(cherry picked from commit 36a21a43af)
This commit is contained in:
Haoyu Qiu
2023-01-04 14:16:57 +08:00
committed by Rémi Verschelde
parent 91a85e50b4
commit c03c23751b
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scene/gui/tree.cpp
View File

@@ -2758,12 +2758,6 @@ Size2 Tree::get_internal_min_size() const {
void Tree::update_scrollbars() { void Tree::update_scrollbars() {
Size2 size = get_size(); Size2 size = get_size();
int tbh;
if (show_column_titles) {
tbh = _get_title_button_height();
} else {
tbh = 0;
}
Size2 hmin = h_scroll->get_combined_minimum_size(); Size2 hmin = h_scroll->get_combined_minimum_size();
Size2 vmin = v_scroll->get_combined_minimum_size(); Size2 vmin = v_scroll->get_combined_minimum_size();
@@ -2775,14 +2769,15 @@ void Tree::update_scrollbars() {
h_scroll->set_end(Point2(size.width - vmin.width, size.height)); h_scroll->set_end(Point2(size.width - vmin.width, size.height));
Size2 min = get_internal_min_size(); Size2 min = get_internal_min_size();
const real_t tree_content_height = size.height - hmin.height - _get_title_button_height();
if (min.height < size.height - hmin.height) { if (min.height < tree_content_height) {
v_scroll->hide(); v_scroll->hide();
cache.offset.y = 0; cache.offset.y = 0;
} else { } else {
v_scroll->show(); v_scroll->show();
v_scroll->set_max(min.height); v_scroll->set_max(min.height);
v_scroll->set_page(size.height - hmin.height - tbh); v_scroll->set_page(tree_content_height);
cache.offset.y = v_scroll->get_value(); cache.offset.y = v_scroll->get_value();
} }