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

removed floor so that global pos works with scale

Browse source 
(cherry picked from commit 3b5ac579a9)
This commit is contained in:
alexholly 2017-07-05 23:01:26 +02:00 committed by Rémi Verschelde
parent 41b8a28c5f
commit 0cc1ba947f
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

@ -1161,8 +1161,8 @@ void Control::_size_changed() {
} }
} }
Point2 new_pos_cache = Point2(margin_pos[0], margin_pos[1]).floor(); Point2 new_pos_cache = Point2(margin_pos[0], margin_pos[1]);
Size2 new_size_cache = Point2(margin_pos[2], margin_pos[3]).floor() - new_pos_cache; Size2 new_size_cache = Point2(margin_pos[2], margin_pos[3]) - new_pos_cache;
Size2 minimum_size = get_combined_minimum_size(); Size2 minimum_size = get_combined_minimum_size();
new_size_cache.x = MAX(minimum_size.x, new_size_cache.x); new_size_cache.x = MAX(minimum_size.x, new_size_cache.x);