Skip to content

Fix selection box positioning and alignment when document is PTZ'd #3718

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 11 commits into
base: master
Choose a base branch
from
Open

Fix selection box positioning and alignment when document is PTZ'd #3718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e044f13
fixed Box selection with the Select tool and Path tool to follow canv…
krVatsal Feb 4, 2026
962ab29
Move drag_start_document into Drawing state variant to make invalid s…
krVatsal Mar 1, 2026
cd52176
Make selection_box() unconditionally use document-space coordinates
krVatsal Mar 1, 2026
bde3855
fix tiny square drawing bug on initial click down
krVatsal Mar 1, 2026
26c9a7f
replicated same changes to path tool
krVatsal Mar 1, 2026
8c14106
Merge branch 'master' into fix-cooridnate-system-mismatch-during-an-a…
krVatsal Mar 1, 2026
cc4cf57
fix fill color bug
krVatsal Mar 1, 2026
bc3d9ec
fix roundtrip drift path
krVatsal Mar 1, 2026
e2b3c37
Merge branch 'master' into fix-cooridnate-system-mismatch-during-an-a…
krVatsal Mar 3, 2026
b79de5c
Merge branch 'master' into fix-cooridnate-system-mismatch-during-an-a…
krVatsal Mar 8, 2026
db44b58
Remove accidentally committed node_modules files
krVatsal Mar 8, 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
109 changes: 63 additions & 46 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 @@ -544,13 +544,14 @@ pub struct SlidingPointInfo {
connected_segments: [SlidingSegmentData; 2],
}

#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
#[derive(Clone, Copy, Debug, Default, PartialEq)]
enum PathToolFsmState {
#[default]
Ready,
Dragging(DraggingState),
Drawing {
selection_shape: SelectionShapeType,
drag_start_document: DVec2,
},
SlidingPoint,
}
Expand Down Expand Up @@ -618,13 +619,13 @@ impl PathToolData {
PathToolFsmState::Dragging(self.dragging_state)
}

pub fn selection_quad(&self, metadata: &DocumentMetadata) -> Quad {
let bbox = self.selection_box(metadata);
pub fn selection_quad(&self, drag_start_document: DVec2, metadata: &DocumentMetadata) -> Quad {
let bbox = self.selection_box(drag_start_document, metadata);
Quad::from_box(bbox)
}

pub fn calculate_selection_mode_from_direction(&mut self, metadata: &DocumentMetadata) -> SelectionMode {
let bbox = self.selection_box(metadata);
pub fn calculate_selection_mode_from_direction(&mut self, drag_start_document: DVec2, metadata: &DocumentMetadata) -> SelectionMode {
let bbox = self.selection_box(drag_start_document, metadata);
let above_threshold = bbox[1].distance_squared(bbox[0]) > DRAG_DIRECTION_MODE_DETERMINATION_THRESHOLD.powi(2);

if self.selection_mode.is_none() && above_threshold {
Expand All @@ -640,15 +641,16 @@ impl PathToolData {
self.selection_mode.unwrap_or(SelectionMode::Touched)
}

pub fn selection_box(&self, metadata: &DocumentMetadata) -> [DVec2; 2] {
// Convert previous mouse position to viewport space first
pub fn selection_box(&self, drag_start_document: DVec2, metadata: &DocumentMetadata) -> [DVec2; 2] {
// Transform the document-anchored start point to viewport
let document_to_viewport = metadata.document_to_viewport;
let start_viewport = document_to_viewport.transform_point2(drag_start_document);
let previous_mouse = document_to_viewport.transform_point2(self.previous_mouse_position);
if previous_mouse == self.drag_start_pos {
if previous_mouse == start_viewport {
let tolerance = DVec2::splat(SELECTION_TOLERANCE);
[self.drag_start_pos - tolerance, self.drag_start_pos + tolerance]
[start_viewport - tolerance, start_viewport + tolerance]
} else {
[self.drag_start_pos, previous_mouse]
[start_viewport, previous_mouse]
}
}

Expand Down Expand Up @@ -899,19 +901,21 @@ impl PathToolData {

self.started_drawing_from_inside = true;

let drag_start_document = document.metadata().document_to_viewport.inverse().transform_point2(input.mouse.position);
self.drag_start_pos = input.mouse.position;
self.previous_mouse_position = document.metadata().document_to_viewport.inverse().transform_point2(input.mouse.position);
self.previous_mouse_position = drag_start_document;

let selection_shape = if lasso_select { SelectionShapeType::Lasso } else { SelectionShapeType::Box };
PathToolFsmState::Drawing { selection_shape }
PathToolFsmState::Drawing { selection_shape, drag_start_document }
}
// Start drawing
else {
let drag_start_document = document.metadata().document_to_viewport.inverse().transform_point2(input.mouse.position);
self.drag_start_pos = input.mouse.position;
self.previous_mouse_position = document.metadata().document_to_viewport.inverse().transform_point2(input.mouse.position);
self.previous_mouse_position = drag_start_document;

let selection_shape = if lasso_select { SelectionShapeType::Lasso } else { SelectionShapeType::Box };
PathToolFsmState::Drawing { selection_shape }
PathToolFsmState::Drawing { selection_shape, drag_start_document }
}
}

Expand Down Expand Up @@ -1888,22 +1892,24 @@ impl Fsm for PathToolFsmState {
overlay_context.outline(outline, layer_to_viewport, Some(color));
}
}
Self::Drawing { selection_shape } => {
Self::Drawing { selection_shape, drag_start_document } => {
let fill_color = Some(COLOR_OVERLAY_BLUE_05);

let selection_mode = match tool_action_data.preferences.get_selection_mode() {
SelectionMode::Directional => tool_data.calculate_selection_mode_from_direction(document.metadata()),
SelectionMode::Directional => tool_data.calculate_selection_mode_from_direction(drag_start_document, document.metadata()),
selection_mode => selection_mode,
};

let quad = tool_data.selection_quad(document.metadata());
let quad = tool_data.selection_quad(drag_start_document, document.metadata());

let select_segments = tool_options.path_editing_mode.segment_editing_mode;
let select_points = tool_options.path_editing_mode.point_editing_mode;
let (points_inside, segments_inside) = match selection_shape {
SelectionShapeType::Box => {
let previous_mouse = document.metadata().document_to_viewport.transform_point2(tool_data.previous_mouse_position);
let bbox = Rect::new(tool_data.drag_start_pos.x, tool_data.drag_start_pos.y, previous_mouse.x, previous_mouse.y).abs();
let document_to_viewport = document.metadata().document_to_viewport;
let start_viewport = document_to_viewport.transform_point2(drag_start_document);
let previous_mouse = document_to_viewport.transform_point2(tool_data.previous_mouse_position);
let bbox = Rect::new(start_viewport.x, start_viewport.y, previous_mouse.x, previous_mouse.y).abs();
shape_editor.get_inside_points_and_segments(
&document.network_interface,
SelectionShape::Box(bbox),
Expand Down Expand Up @@ -2030,7 +2036,7 @@ impl Fsm for PathToolFsmState {
)
}
(
PathToolFsmState::Drawing { selection_shape },
PathToolFsmState::Drawing { selection_shape, drag_start_document },
PathToolMessage::PointerMove {
equidistant,
toggle_colinear,
Expand Down Expand Up @@ -2080,7 +2086,7 @@ impl Fsm for PathToolFsmState {
];
tool_data.auto_panning.setup_by_mouse_position(input, viewport, &messages, responses);

PathToolFsmState::Drawing { selection_shape }
PathToolFsmState::Drawing { selection_shape, drag_start_document }
}
(
PathToolFsmState::Dragging(_),
Expand Down Expand Up @@ -2241,13 +2247,20 @@ impl Fsm for PathToolFsmState {

self
}
(PathToolFsmState::Drawing { selection_shape: selection_type }, PathToolMessage::PointerOutsideViewport { .. }) => {
(
PathToolFsmState::Drawing {
selection_shape: selection_type,
drag_start_document,
},
PathToolMessage::PointerOutsideViewport { .. },
) => {
// Auto-panning
if let Some(offset) = tool_data.auto_panning.shift_viewport(input, viewport, responses) {
tool_data.drag_start_pos += offset;
}
tool_data.auto_panning.shift_viewport(input, viewport, responses);

PathToolFsmState::Drawing { selection_shape: selection_type }
PathToolFsmState::Drawing {
selection_shape: selection_type,
drag_start_document,
}
}
(PathToolFsmState::Dragging(dragging_state), PathToolMessage::PointerOutsideViewport { .. }) => {
// Auto-panning
Expand Down Expand Up @@ -2299,7 +2312,7 @@ impl Fsm for PathToolFsmState {

state
}
(PathToolFsmState::Drawing { selection_shape }, PathToolMessage::Enter { extend_selection, shrink_selection }) => {
(PathToolFsmState::Drawing { selection_shape, drag_start_document }, PathToolMessage::Enter { extend_selection, shrink_selection }) => {
let extend_selection = input.keyboard.get(extend_selection as usize);
let shrink_selection = input.keyboard.get(shrink_selection as usize);

Expand All @@ -2313,17 +2326,18 @@ impl Fsm for PathToolFsmState {

let document_to_viewport = document.metadata().document_to_viewport;
let previous_mouse = document_to_viewport.transform_point2(tool_data.previous_mouse_position);
if tool_data.drag_start_pos == previous_mouse {
let start_viewport = document_to_viewport.transform_point2(drag_start_document);
if start_viewport == previous_mouse {
responses.add(NodeGraphMessage::SelectedNodesSet { nodes: vec![] });
} else {
let selection_mode = match tool_action_data.preferences.get_selection_mode() {
SelectionMode::Directional => tool_data.calculate_selection_mode_from_direction(document.metadata()),
SelectionMode::Directional => tool_data.calculate_selection_mode_from_direction(drag_start_document, document.metadata()),
selection_mode => selection_mode,
};

match selection_shape {
SelectionShapeType::Box => {
let bbox = Rect::new(tool_data.drag_start_pos.x, tool_data.drag_start_pos.y, previous_mouse.x, previous_mouse.y).abs();
let bbox = Rect::new(start_viewport.x, start_viewport.y, previous_mouse.x, previous_mouse.y).abs();

shape_editor.select_all_in_shape(
&document.network_interface,
Expand All @@ -2336,16 +2350,18 @@ impl Fsm for PathToolFsmState {
selection_mode,
);
}
SelectionShapeType::Lasso => shape_editor.select_all_in_shape(
&document.network_interface,
SelectionShape::Lasso(&tool_data.lasso_polygon),
selection_change,
tool_options.path_overlay_mode,
tool_data.frontier_handles_info.as_ref(),
tool_options.path_editing_mode.segment_editing_mode,
tool_options.path_editing_mode.point_editing_mode,
selection_mode,
),
SelectionShapeType::Lasso => {
shape_editor.select_all_in_shape(
&document.network_interface,
SelectionShape::Lasso(&tool_data.lasso_polygon),
selection_change,
tool_options.path_overlay_mode,
tool_data.frontier_handles_info.as_ref(),
tool_options.path_editing_mode.segment_editing_mode,
tool_options.path_editing_mode.point_editing_mode,
selection_mode,
);
}
}
}

Expand Down Expand Up @@ -2388,7 +2404,7 @@ impl Fsm for PathToolFsmState {
PathToolFsmState::Ready
}
// Mouse up
(PathToolFsmState::Drawing { selection_shape }, PathToolMessage::DragStop { extend_selection, shrink_selection }) => {
(PathToolFsmState::Drawing { selection_shape, drag_start_document }, PathToolMessage::DragStop { extend_selection, shrink_selection }) => {
let extend_selection = input.keyboard.get(extend_selection as usize);
let shrink_selection = input.keyboard.get(shrink_selection as usize);

Expand All @@ -2404,12 +2420,13 @@ impl Fsm for PathToolFsmState {
let previous_mouse = document_to_viewport.transform_point2(tool_data.previous_mouse_position);

let selection_mode = match tool_action_data.preferences.get_selection_mode() {
SelectionMode::Directional => tool_data.calculate_selection_mode_from_direction(document.metadata()),
SelectionMode::Directional => tool_data.calculate_selection_mode_from_direction(drag_start_document, document.metadata()),
selection_mode => selection_mode,
};
tool_data.started_drawing_from_inside = false;

if tool_data.drag_start_pos.distance(previous_mouse) < 1e-8 {
let start_viewport = document_to_viewport.transform_point2(drag_start_document);
if start_viewport.distance(previous_mouse) < 1e-8 {
// Clicked inside or outside the shape then deselect all of the points/segments
if document.click(input, viewport).is_some() && tool_data.stored_selection.is_none() {
tool_data.stored_selection = Some(shape_editor.selected_shape_state.clone());
Expand All @@ -2420,7 +2437,7 @@ impl Fsm for PathToolFsmState {
} else {
match selection_shape {
SelectionShapeType::Box => {
let bbox = Rect::new(tool_data.drag_start_pos.x, tool_data.drag_start_pos.y, previous_mouse.x, previous_mouse.y).abs();
let bbox = Rect::new(start_viewport.x, start_viewport.y, previous_mouse.x, previous_mouse.y).abs();

shape_editor.select_all_in_shape(
&document.network_interface,
Expand Down Expand Up @@ -2681,7 +2698,7 @@ impl Fsm for PathToolFsmState {
let mut end_point_id = None;

// Get the merged layer's transform to convert local positions to document space
let layer_transform = document.metadata().transform_to_document(layer);
let layer_transform = document.metadata().transform_to_document_if_feeds(layer, &document.network_interface);

for (i, &local_pos) in positions.iter().enumerate() {
// Transform the local position to document space for comparison
Expand Down Expand Up @@ -2740,7 +2757,7 @@ impl Fsm for PathToolFsmState {
let Some(old_vector) = document.network_interface.compute_modified_vector(layer) else { continue };

// Also get the transform node that is applied on the layer if it exists
let transform = document.metadata().transform_to_document(layer);
let transform = document.metadata().transform_to_document_if_feeds(layer, &document.network_interface);

let mut new_vector = Vector::default();

Expand Down
Loading
Loading