Skip to content

Arrow tool features improvement #3650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
krVatsal wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Arrow tool features improvement #3650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de0317b
fixed the arrow's parameters
krVatsal Jan 17, 2026
0c9306c
shifted the arrow's origin to its tail
krVatsal Jan 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions editor/src/messages/tool/common_functionality/shapes/arrow_shape.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ impl Arrow {
layer: LayerNodeIdentifier,
tool_data: &mut ShapeToolData,
_modifier: ShapeToolModifierKey,
shaft_width: f64,
head_width: f64,
head_length: f64,
responses: &mut VecDeque<Message>,
) {
// Track current mouse position in viewport space
Expand All @@ -56,11 +59,7 @@ impl Arrow {
return;
};

// Calculate proportional dimensions based on arrow length
let shaft_width = length_document * 0.1;
let head_width = length_document * 0.3;
let head_length = length_document * 0.2;

// Use fixed dimensions from tool options - only length changes during drag
// Update Arrow node parameters with document space coordinates (like Line tool)
responses.add(NodeGraphMessage::SetInput {
input_connector: InputConnector::node(node_id, 1),
Expand Down
85 changes: 84 additions & 1 deletion editor/src/messages/tool/tool_messages/shape_tool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ pub struct ShapeToolOptions {
grid_type: GridType,
spiral_type: SpiralType,
turns: f64,
arrow_shaft_width: f64,
arrow_head_width: f64,
arrow_head_length: f64,
}

impl Default for ShapeToolOptions {
Expand All @@ -58,6 +61,9 @@ impl Default for ShapeToolOptions {
spiral_type: SpiralType::Archimedean,
turns: 5.,
grid_type: GridType::Rectangular,
arrow_shaft_width: 14.0,
arrow_head_width: 32.0,
arrow_head_length: 28.0,
}
}
}
Expand All @@ -76,6 +82,9 @@ pub enum ShapeOptionsUpdate {
SpiralType(SpiralType),
Turns(f64),
GridType(GridType),
ArrowShaftWidth(f64),
ArrowHeadWidth(f64),
ArrowHeadLength(f64),
}

#[impl_message(Message, ToolMessage, Shape)]
Expand Down Expand Up @@ -236,6 +245,51 @@ fn create_weight_widget(line_weight: f64) -> WidgetInstance {
.widget_instance()
}

fn create_arrow_shaft_width_widget(shaft_width: f64) -> WidgetInstance {
NumberInput::new(Some(shaft_width))
.unit(" px")
.label("Shaft")
.min(0.1)
.max(1000.)
.on_update(|number_input: &NumberInput| {
ShapeToolMessage::UpdateOptions {
options: ShapeOptionsUpdate::ArrowShaftWidth(number_input.value.unwrap()),
}
.into()
})
.widget_instance()
}

fn create_arrow_head_width_widget(head_width: f64) -> WidgetInstance {
NumberInput::new(Some(head_width))
.unit(" px")
.label("Head W")
.min(0.1)
.max(1000.)
.on_update(|number_input: &NumberInput| {
ShapeToolMessage::UpdateOptions {
options: ShapeOptionsUpdate::ArrowHeadWidth(number_input.value.unwrap()),
}
.into()
})
.widget_instance()
}

fn create_arrow_head_length_widget(head_length: f64) -> WidgetInstance {
NumberInput::new(Some(head_length))
.unit(" px")
.label("Head L")
.min(0.1)
.max(1000.)
.on_update(|number_input: &NumberInput| {
ShapeToolMessage::UpdateOptions {
options: ShapeOptionsUpdate::ArrowHeadLength(number_input.value.unwrap()),
}
.into()
})
.widget_instance()
}

fn create_spiral_type_widget(spiral_type: SpiralType) -> WidgetInstance {
let entries = vec![vec![
MenuListEntry::new("Archimedean").label("Archimedean").on_commit(move |_| {
Expand Down Expand Up @@ -304,6 +358,15 @@ impl LayoutHolder for ShapeTool {
widgets.push(Separator::new(SeparatorStyle::Unrelated).widget_instance());
}

if self.options.shape_type == ShapeType::Arrow {
widgets.push(create_arrow_shaft_width_widget(self.options.arrow_shaft_width));
widgets.push(Separator::new(SeparatorStyle::Related).widget_instance());
widgets.push(create_arrow_head_width_widget(self.options.arrow_head_width));
widgets.push(Separator::new(SeparatorStyle::Related).widget_instance());
widgets.push(create_arrow_head_length_widget(self.options.arrow_head_length));
widgets.push(Separator::new(SeparatorStyle::Unrelated).widget_instance());
}

if self.options.shape_type != ShapeType::Line {
widgets.append(&mut self.options.fill.create_widgets(
"Fill",
Expand Down Expand Up @@ -414,6 +477,15 @@ impl<'a> MessageHandler<ToolMessage, &mut ToolActionMessageContext<'a>> for Shap
ShapeOptionsUpdate::GridType(grid_type) => {
self.options.grid_type = grid_type;
}
ShapeOptionsUpdate::ArrowShaftWidth(shaft_width) => {
self.options.arrow_shaft_width = shaft_width;
}
ShapeOptionsUpdate::ArrowHeadWidth(head_width) => {
self.options.arrow_head_width = head_width;
}
ShapeOptionsUpdate::ArrowHeadLength(head_length) => {
self.options.arrow_head_length = head_length;
}
}

update_dynamic_hints(&self.fsm_state, responses, &self.tool_data);
Expand Down Expand Up @@ -905,7 +977,18 @@ impl Fsm for ShapeToolFsmState {
ShapeType::Star => Star::update_shape(document, input, viewport, layer, tool_data, modifier, responses),
ShapeType::Circle => Circle::update_shape(document, input, viewport, layer, tool_data, modifier, responses),
ShapeType::Arc => Arc::update_shape(document, input, viewport, layer, tool_data, modifier, responses),
ShapeType::Arrow => Arrow::update_shape(document, input, viewport, layer, tool_data, modifier, responses),
ShapeType::Arrow => Arrow::update_shape(
document,
input,
viewport,
layer,
tool_data,
modifier,
tool_options.arrow_shaft_width,
tool_options.arrow_head_width,
tool_options.arrow_head_length,
responses,
),
ShapeType::Spiral => Spiral::update_shape(document, input, viewport, layer, tool_data, responses),
ShapeType::Grid => Grid::update_shape(document, input, layer, tool_options.grid_type, tool_data, modifier, responses),
ShapeType::Rectangle => Rectangle::update_shape(document, input, viewport, layer, tool_data, modifier, responses),
Expand Down
14 changes: 8 additions & 6 deletions node-graph/libraries/vector-types/src/subpath/core.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,14 +330,16 @@ impl<PointId: Identifier> Subpath<PointId> {
let head_base_distance = (length - head_length).max(0.);
let head_base = start + direction * head_base_distance;

// Arrow path starts at the tail (origin), traces around the shape, and returns to tail
let anchors = [
start - perpendicular * half_shaft, // Tail bottom
head_base - perpendicular * half_shaft, // Head base bottom (shaft)
head_base - perpendicular * half_head, // Head base bottom (wide)
end, // Tip
head_base + perpendicular * half_head, // Head base top (wide)
head_base + perpendicular * half_shaft, // Head base top (shaft)
start, // Tail center (origin)
start + perpendicular * half_shaft, // Tail top
head_base + perpendicular * half_shaft, // Head base top (shaft)
head_base + perpendicular * half_head, // Head base top (wide)
end, // Tip
head_base - perpendicular * half_head, // Head base bottom (wide)
head_base - perpendicular * half_shaft, // Head base bottom (shaft)
start - perpendicular * half_shaft, // Tail bottom
];

Self::from_anchors(anchors, true)
Expand Down
Loading