From 6adb01aac18e8d86a089f8379d79cb1dd8b38282 Mon Sep 17 00:00:00 2001
From: Manolis Papadeas <35376950+OverloadedOrama@users.noreply.github.com>
Date: Sat, 8 May 2021 16:06:02 +0300
Subject: [PATCH] Cursor shape no longer changes when a gizmo is being dragged
 and the mouse cursor goes above another gizmo

---
 src/UI/Canvas/Selection.gd | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/UI/Canvas/Selection.gd b/src/UI/Canvas/Selection.gd
index bfaa7fcff..9585f3193 100644
--- a/src/UI/Canvas/Selection.gd
+++ b/src/UI/Canvas/Selection.gd
@@ -96,10 +96,11 @@ func _input(event : InputEvent) -> void:
 				if g.rect.has_point(Global.canvas.current_pixel):
 					gizmo = Gizmo.new(g.type, g.direction)
 					break
-		if gizmo:
-			Global.main_viewport.mouse_default_cursor_shape = gizmo.get_cursor()
-		elif !dragged_gizmo:
-			Global.main_viewport.mouse_default_cursor_shape = Input.CURSOR_CROSS
+		if !dragged_gizmo:
+			if gizmo:
+				Global.main_viewport.mouse_default_cursor_shape = gizmo.get_cursor()
+			else:
+				Global.main_viewport.mouse_default_cursor_shape = Input.CURSOR_CROSS
 
 		if event is InputEventMouseButton and event.button_index == BUTTON_LEFT:
 			if event.pressed: