diff options
| author | Thomas Herzog <karroffel@users.noreply.github.com> | 2017-07-11 00:00:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-11 00:00:43 +0200 |
| commit | e2e6c2ba439f5a34ef444a3189f8436984a90d0d (patch) | |
| tree | dcfb149bd46d5f0bc74a726ef55c7555af40a0d5 /scene | |
| parent | 93dcfe1246118f65d0ecf75445556afd7bed99da (diff) | |
| parent | 3b5ac579a94a588907ec88ced8de1c60b6f737fb (diff) | |
Merge pull request #9521 from AlexHolly/control-posi-to-posr
removed floor so that global pos works with scale in control
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/gui/control.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index bf8d81d4a6..e9e299ffc5 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -1229,8 +1229,8 @@ void Control::_size_changed() { } } - Point2 new_pos_cache = Point2(margin_pos[0], margin_pos[1]).floor(); - Size2 new_size_cache = Point2(margin_pos[2], margin_pos[3]).floor() - new_pos_cache; + Point2 new_pos_cache = Point2(margin_pos[0], margin_pos[1]); + Size2 new_size_cache = Point2(margin_pos[2], margin_pos[3]) - new_pos_cache; Size2 minimum_size = get_combined_minimum_size(); |