Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-29 23:53:08 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Check for null pointer in get_column_width(0)

Browse Source 
(cherry picked from commit fa6fd3a2d0)
This commit is contained in:
Justin Ho 2021-03-17 12:10:36 -07:00 committed by Rémi Verschelde
parent a5bcacb115
commit 672fdb7af2
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scene/gui/tree.cpp
View File

@ -3370,9 +3370,13 @@ int Tree::get_column_width(int p_column) const {
if (!columns[p_column].expand)
return columns[p_column].min_width;
int expand_area = get_size().width;
Ref<StyleBox> bg = cache.bg;
int expand_area = get_size().width - (bg->get_margin(MARGIN_LEFT) + bg->get_margin(MARGIN_RIGHT));
if (bg.is_valid()) {
expand_area -= bg->get_margin(MARGIN_LEFT) + bg->get_margin(MARGIN_RIGHT);
}
if (v_scroll->is_visible_in_tree())
expand_area -= v_scroll->get_combined_minimum_size().width;