Skip to content

Commit 5b92901

Browse files
AustinHenKeavon
andauthored
Fix Path tool not displaying its hints during G/R/S modes (#3222)
* Path tool no longer overrides other hints * Related cleanup --------- Co-authored-by: Keavon Chambers <keavon@keavon.com>
1 parent f186465 commit 5b92901

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

editor/src/messages/tool/common_functionality/shape_editor.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1879,6 +1879,7 @@ impl ShapeState {
18791879
_ => self.sorted_selected_layers(network_interface.document_metadata()).find_map(closest_seg),
18801880
}
18811881
}
1882+
18821883
pub fn get_dragging_state(&self, network_interface: &NodeNetworkInterface) -> PointSelectState {
18831884
for &layer in self.selected_shape_state.keys() {
18841885
let Some(vector) = network_interface.compute_modified_vector(layer) else { continue };

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3182,10 +3182,9 @@ impl Fsm for PathToolFsmState {
31823182
PathToolFsmState::Ready
31833183
}
31843184
(_, PathToolMessage::SelectedPointUpdated) => {
3185-
let colinear = shape_editor.selected_manipulator_angles(&document.network_interface);
31863185
tool_data.dragging_state = DraggingState {
31873186
point_select_state: shape_editor.get_dragging_state(&document.network_interface),
3188-
colinear,
3187+
colinear: shape_editor.selected_manipulator_angles(&document.network_interface),
31893188
};
31903189

31913190
let old = tool_data.make_path_editable_is_allowed;
@@ -3663,4 +3662,5 @@ fn update_dynamic_hints(
36633662
PathToolFsmState::SlidingPoint => HintData(vec![HintGroup(vec![HintInfo::mouse(MouseMotion::Rmb, ""), HintInfo::keys([Key::Escape], "Cancel").prepend_slash()])]),
36643663
};
36653664
hint_data.send_layout(responses);
3665+
responses.add(ToolMessage::UpdateHints);
36663666
}

0 commit comments

Comments
 (0)