Merge pull request #23561 from groud/fix_scaling

Fixes uniform scaling issues (for real this time)

1 files changed, 1 insertions, 7 deletions

diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp
index bb3ae1dac9..45f7f36cbd 100644
--- a/editor/plugins/canvas_item_editor_plugin.cpp
+++ b/editor/plugins/canvas_item_editor_plugin.cpp
@@ -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;
 				}