Skip to content

Make Path Editable #3735

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

Draft
jsjgdh wants to merge 4 commits into
base: master
Choose a base branch
from
+33 −3
Draft

Make Path Editable #3735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3471e73
Make Path Editable
jsjgdh Feb 8, 2026
65c14fc
error corrected
jsjgdh Feb 8, 2026
a898c93
Merge branch 'master' into workflow
jsjgdh Mar 13, 2026
135ac75
Simplify
jsjgdh Mar 13, 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
3 changes: 2 additions & 1 deletion editor/src/messages/tool/common_functionality/utility_functions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ use crate::messages::tool::utility_types::ToolType;
use glam::{DAffine2, DVec2};
use graph_craft::concrete;
use graph_craft::document::value::TaggedValue;
use graphene_std::Graphic;
use graphene_std::renderer::Quad;
use graphene_std::subpath::{Bezier, BezierHandles};
use graphene_std::table::Table;
Expand Down Expand Up @@ -576,7 +577,7 @@ pub fn make_path_editable_is_allowed(network_interface: &mut NodeNetworkInterfac
let node_id = NodeGraphLayer::new(first_layer, network_interface).horizontal_layer_flow().nth(1)?;

let output_type = network_interface.output_type(&OutputConnector::node(node_id, 0), &[]);
if output_type.compiled_nested_type() != Some(&concrete!(Table<Vector>)) {
if output_type.compiled_nested_type() != Some(&concrete!(Table<Vector>)) && output_type.compiled_nested_type() != Some(&concrete!(Table<Graphic>)) {
return None;
}

Expand Down
33 changes: 31 additions & 2 deletions editor/src/messages/tool/tool_messages/path_tool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use crate::messages::portfolio::document::overlays::utility_functions::{path_ove
use crate::messages::portfolio::document::overlays::utility_types::{DrawHandles, OverlayContext};
use crate::messages::portfolio::document::utility_types::clipboards::Clipboard;
use crate::messages::portfolio::document::utility_types::document_metadata::{DocumentMetadata, LayerNodeIdentifier};
use crate::messages::portfolio::document::utility_types::network_interface::NodeNetworkInterface;
use crate::messages::portfolio::document::utility_types::network_interface::{NodeNetworkInterface, OutputConnector};
use crate::messages::portfolio::document::utility_types::transformation::Axis;
use crate::messages::preferences::SelectionMode;
use crate::messages::tool::common_functionality::auto_panning::AutoPanning;
Expand All @@ -24,9 +24,11 @@ use crate::messages::tool::common_functionality::shape_editor::{
};
use crate::messages::tool::common_functionality::snapping::{SnapCache, SnapCandidatePoint, SnapConstraint, SnapData, SnapManager};
use crate::messages::tool::common_functionality::utility_functions::{calculate_segment_angle, find_two_param_best_approximate, make_path_editable_is_allowed};
use graph_craft::concrete;
use graphene_std::Color;
use graphene_std::renderer::Quad;
use graphene_std::subpath::pathseg_points;
use graphene_std::table::Table;
use graphene_std::transform::ReferencePoint;
use graphene_std::uuid::NodeId;
use graphene_std::vector::algorithms::util::pathseg_tangent;
Expand Down Expand Up @@ -1578,7 +1580,34 @@ impl Fsm for PathToolFsmState {
match (self, event) {
(_, PathToolMessage::SelectionChanged) => {
// Set the newly targeted layers to visible
let target_layers = document.network_interface.selected_nodes().selected_layers(document.metadata()).collect();
let mut target_layers = document.network_interface.selected_nodes().selected_layers(document.metadata()).collect::<Vec<_>>();

let mut i = 0;
while i < target_layers.len() {
let layer = target_layers[i];
let graph_layer = graph_modification_utils::NodeGraphLayer::new(layer, &document.network_interface);
let node_id = graph_layer.horizontal_layer_flow().nth(1);
let is_vector_layer = if let Some(node) = node_id {
let output_connector = OutputConnector::node(node, 0);
let output_type = document.network_interface.output_type(&output_connector, &[]);
output_type.compiled_nested_type() == Some(&concrete!(Table<Vector>))
} else {
false
};
Comment on lines +1590 to +1596
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Mar 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

The logic to identify a vector layer should also include Table<Graphic> to be consistent with the changes in make_path_editable_is_allowed. Currently, it only checks for Table<Vector>, which could lead to the path tool incorrectly trying to drill down into Graphic layers instead of treating them as editable paths.

Suggested change
let is_vector_layer = if let Some(node) = node_id {
let output_connector = OutputConnector::node(node, 0);
let output_type = document.network_interface.output_type(&output_connector, &[]);
output_type.compiled_nested_type() == Some(&concrete!(Table<Vector>))
} else {
false
};
let is_vector_layer = if let Some(node) = node_id {
let output_connector = OutputConnector::node(node, 0);
let output_type = document.network_interface.output_type(&output_connector, &[]);
let ty = output_type.compiled_nested_type();
ty == Some(&concrete!(Table<Vector>)) || ty == Some(&concrete!(Table<Graphic>))
} else {
false
};


if is_vector_layer {
i += 1;
continue;
}

let mut children = layer.children(document.metadata());
if let Some(first_child) = children.next() {
let children_to_insert: Vec<_> = std::iter::once(first_child).chain(children).collect();
target_layers.splice(i..i + 1, children_to_insert);
} else {
i += 1;
}
}

shape_editor.set_selected_layers(target_layers);

Expand Down
Loading