asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #70906 from timothyqiu/tree-scroll-3.x

Browse source 
[3.x] Fix Tree overflow without scrolling being enabled
This commit is contained in:
Rémi Verschelde 2023-01-09 09:16:38 +01:00
commit b082223263
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 3 additions and 8 deletions
Show stats 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();
} }