Code review

Author: Keavon

editor/src/messages/tool/common_functionality/gizmos/gizmo_manager.rs

@@ -271,7 +271,6 @@ impl GizmoManager {
 	///
 	/// If a gizmo is active (hovered or being manipulated), it returns the cursor icon associated with that gizmo;
 	/// otherwise, returns `None` to indicate the default crosshair cursor should be used.
-
 	pub fn mouse_cursor_icon(&self) -> Option<MouseCursorIcon> {
 		self.active_shape_handler.as_ref().and_then(|h| h.gizmo_cursor_icon())
 	}

editor/src/messages/tool/tool_messages/shape_tool.rs

@@ -464,12 +464,7 @@ impl Fsm for ShapeToolFsmState {
 						}
 					}
 
-					let mut cursor;
-
-					cursor = tool_data.transform_cage_mouse_icon(input);
-					if let Some(gizmo_cursor_icon) = tool_data.gizmo_manager.mouse_cursor_icon() {
-						cursor = gizmo_cursor_icon;
-					}
+					let cursor = tool_data.gizmo_manager.mouse_cursor_icon().unwrap_or_else(|| tool_data.transform_cage_mouse_icon(input));
 
 					tool_data.cursor = cursor;
 					responses.add(FrontendMessage::UpdateMouseCursor { cursor });