fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-10-06 05:08:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix Path tool not displaying its hints during G/R/S modes (#3222)

Browse Source 
* Path tool no longer overrides other hints

* Related cleanup

---------

Co-authored-by: Keavon Chambers <keavon@keavon.com>
This commit is contained in:
Austin Henlotter
2026-02-16 04:23:47 +00:00
committed by GitHub
co-authored by Keavon Chambers
parent f186465220
commit 5b92901715
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/src/messages/tool/common_functionality/shape_editor.rs
+1
View File
@@ -1879,6 +1879,7 @@ impl ShapeState {
_ => self.sorted_selected_layers(network_interface.document_metadata()).find_map(closest_seg), _ => self.sorted_selected_layers(network_interface.document_metadata()).find_map(closest_seg),
} }
} }
pub fn get_dragging_state(&self, network_interface: &NodeNetworkInterface) -> PointSelectState { pub fn get_dragging_state(&self, network_interface: &NodeNetworkInterface) -> PointSelectState {
for &layer in self.selected_shape_state.keys() { for &layer in self.selected_shape_state.keys() {
let Some(vector) = network_interface.compute_modified_vector(layer) else { continue }; let Some(vector) = network_interface.compute_modified_vector(layer) else { continue };
editor/src/messages/tool/tool_messages/path_tool.rs
+2 -2
View File
@@ -3182,10 +3182,9 @@ impl Fsm for PathToolFsmState {
PathToolFsmState::Ready PathToolFsmState::Ready
} }
(_, PathToolMessage::SelectedPointUpdated) => { (_, PathToolMessage::SelectedPointUpdated) => {
let colinear = shape_editor.selected_manipulator_angles(&document.network_interface);
tool_data.dragging_state = DraggingState { tool_data.dragging_state = DraggingState {
point_select_state: shape_editor.get_dragging_state(&document.network_interface), point_select_state: shape_editor.get_dragging_state(&document.network_interface),
colinear, colinear: shape_editor.selected_manipulator_angles(&document.network_interface),
}; };
let old = tool_data.make_path_editable_is_allowed; let old = tool_data.make_path_editable_is_allowed;
@@ -3663,4 +3662,5 @@ fn update_dynamic_hints(
PathToolFsmState::SlidingPoint => HintData(vec![HintGroup(vec![HintInfo::mouse(MouseMotion::Rmb, ""), HintInfo::keys([Key::Escape], "Cancel").prepend_slash()])]), PathToolFsmState::SlidingPoint => HintData(vec![HintGroup(vec![HintInfo::mouse(MouseMotion::Rmb, ""), HintInfo::keys([Key::Escape], "Cancel").prepend_slash()])]),
}; };
hint_data.send_layout(responses); hint_data.send_layout(responses);
responses.add(ToolMessage::UpdateHints);
} }