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

Fixes uniform scaling issues (for real this time)

Browse Source
This commit is contained in:
groud 2018-11-06 21:51:48 +01:00
parent c2b6a900fc
commit 742a9d9023
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) { if (drag_type == DRAG_SCALE_BOTH) {
Size2 scale_factor = drag_to_local / drag_from_local; Size2 scale_factor = drag_to_local / drag_from_local;
if (uniform) { if (uniform) {
if (ABS(scale_factor.x - 1.0) > ABS(scale_factor.y - 1.0)) { scale *= (scale_factor.x + scale_factor.y) / 2.0;
scale.x *= scale_factor.x;
scale.y = scale.x * ratio;
} else {
scale.y *= scale_factor.y;
scale.x = scale.y / ratio;
}
} else { } else {
scale *= scale_factor; scale *= scale_factor;
} }