Skip to content

Commit 46cab9a

Browse files
committed
Fix merge conflict
1 parent 8cfdb67 commit 46cab9a

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,10 @@ impl Fsm for RectangleToolFsmState {
337337
}
338338
(RectangleToolFsmState::Ready, RectangleToolMessage::PointerMove { .. }) => {
339339
shape_data.snap_manager.preview_draw(&SnapData::new(document, input), input.mouse.position);
340-
let mut cursor = tool_data.bounding_box_manager.as_ref().map_or(MouseCursorIcon::Default, |bounds| bounds.get_cursor(input, true));
340+
let mut cursor = tool_data
341+
.bounding_box_manager
342+
.as_ref()
343+
.map_or(MouseCursorIcon::Default, |bounds| bounds.get_cursor(input, true, false, None));
341344

342345
// Dragging the pivot overrules the other operations
343346
if tool_data.pivot.is_over(input.mouse.position) {

0 commit comments

Comments
 (0)