godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #23561 from groud/fix_scaling 

Fixes uniform scaling issues (for real this time)
This commit is contained in:
Rémi Verschelde 2018-11-06 22:07:00 +01:00 committed by GitHub
parent 8f39b36a1a 742a9d9023
commit 5099b9d79a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editor/plugins/canvas_item_editor_plugin.cpp
View File

@ -1696,13 +1696,7 @@ bool CanvasItemEditor::_gui_input_scale(const Ref<InputEvent> &p_event) {
if (drag_type == DRAG_SCALE_BOTH) {
Size2 scale_factor = drag_to_local / drag_from_local;
if (uniform) {
if (ABS(scale_factor.x - 1.0) > ABS(scale_factor.y - 1.0)) {
scale.x *= scale_factor.x;
scale.y = scale.x * ratio;
} else {
scale.y *= scale_factor.y;
scale.x = scale.y / ratio;
}
scale *= (scale_factor.x + scale_factor.y) / 2.0;
} else {
scale *= scale_factor;
}