Skip to content

Commit 4487020

Browse files
mTvare6Keavon
andauthored
Fix skew triangles showing up when transform cage isn't selected (#2638)
Co-authored-by: Keavon Chambers <keavon@keavon.com>
1 parent db34ac3 commit 4487020

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -650,16 +650,18 @@ impl Fsm for SelectToolFsmState {
650650

651651
let is_resizing_or_rotating = matches!(self, SelectToolFsmState::ResizingBounds | SelectToolFsmState::SkewingBounds { .. } | SelectToolFsmState::RotatingBounds);
652652

653-
if let Some(bounds) = tool_data.bounding_box_manager.as_mut() {
654-
let edges = bounds.check_selected_edges(input.mouse.position);
655-
let is_skewing = matches!(self, SelectToolFsmState::SkewingBounds { .. });
656-
let is_near_square = edges.is_some_and(|hover_edge| bounds.over_extended_edge_midpoint(input.mouse.position, hover_edge));
657-
if is_skewing || (dragging_bounds && is_near_square && !is_resizing_or_rotating) {
658-
bounds.render_skew_gizmos(&mut overlay_context, tool_data.skew_edge);
659-
}
660-
if !is_skewing && dragging_bounds {
661-
if let Some(edges) = edges {
662-
tool_data.skew_edge = bounds.get_closest_edge(edges, input.mouse.position);
653+
if overlay_context.visibility_settings.transform_cage() && bounds.is_some() {
654+
if let Some(bounds) = tool_data.bounding_box_manager.as_mut() {
655+
let edges = bounds.check_selected_edges(input.mouse.position);
656+
let is_skewing = matches!(self, SelectToolFsmState::SkewingBounds { .. });
657+
let is_near_square = edges.is_some_and(|hover_edge| bounds.over_extended_edge_midpoint(input.mouse.position, hover_edge));
658+
if is_skewing || (dragging_bounds && is_near_square && !is_resizing_or_rotating) {
659+
bounds.render_skew_gizmos(&mut overlay_context, tool_data.skew_edge);
660+
}
661+
if !is_skewing && dragging_bounds {
662+
if let Some(edges) = edges {
663+
tool_data.skew_edge = bounds.get_closest_edge(edges, input.mouse.position);
664+
}
663665
}
664666
}
665667
}

0 commit comments

Comments
 (0)