maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #15655 from endragor/fix-get-parent-range

Browse source 
Fix get_parent_range to return 0 when there is no parent
This commit is contained in:
Rémi Verschelde 2018-01-13 17:05:36 +01:00 committed by GitHub
parent 5f22422d99 0b632be4a9
commit 63e980f746
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scene/gui/control.cpp
View file

@ -1325,7 +1325,7 @@ float Control::_get_parent_range(int p_idx) const {
if (!is_inside_tree()) {
return 1.0;
return 0;
}
if (data.parent_canvas_item) {
@ -1334,7 +1334,7 @@ float Control::_get_parent_range(int p_idx) const {
return get_viewport()->get_visible_rect().size[p_idx & 1];
}
return 1.0;
return 0;
}
float Control::_get_range(int p_idx) const {