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

Add support for skewing the transform cage by Ctrl-dragging its edges (#2251)

Browse Source 
* Skew select bounds with ctrl

* Code review

---------

Co-authored-by: Keavon Chambers <keavon@keavon.com>
This commit is contained in:
James Lindsay
2025-02-05 06:11:59 +00:00
committed by GitHub
co-authored by Keavon Chambers
parent 99a141c2e1
commit 1f836cd2a1
3 changed files with 128 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/src/messages/tool/tool_messages/select_tool.rs
+41 -3
View File
@@ -81,6 +81,7 @@ pub enum SelectToolMessage {
remove_from_selection: Key,
select_deepest: Key,
lasso_select: Key,
skew: Key,
},
DragStop {
remove_from_selection: Key,
@@ -274,6 +275,7 @@ enum SelectToolFsmState {
Drawing { selection_shape: SelectionShapeType },
Dragging,
ResizingBounds,
SkewingBounds,
RotatingBounds,
DraggingPivot,
}
@@ -624,6 +626,7 @@ impl Fsm for SelectToolFsmState {
remove_from_selection,
select_deepest,
lasso_select,
skew,
},
) => {
tool_data.drag_start = input.mouse.position;
@@ -705,7 +708,11 @@ impl Fsm for SelectToolFsmState {
}
tool_data.get_snap_candidates(document, input);
SelectToolFsmState::ResizingBounds
if input.keyboard.key(skew) {
SelectToolFsmState::SkewingBounds
}else{
SelectToolFsmState::ResizingBounds
}
}
// Dragging near the transform cage bounding box to rotate it
else if rotating_bounds {
@@ -877,6 +884,37 @@ impl Fsm for SelectToolFsmState {
}
SelectToolFsmState::ResizingBounds
}
(SelectToolFsmState::SkewingBounds, SelectToolMessage::PointerMove(_)) => {
if let Some(ref mut bounds) = &mut tool_data.bounding_box_manager {
if let Some(movement) = &mut bounds.selected_edges {
let transformation = movement.skew_transform(input.mouse.position, bounds.original_bound_transform);
tool_data.layers_dragging.retain(|layer| {
if *layer != LayerNodeIdentifier::ROOT_PARENT {
document.network_interface.network(&[]).unwrap().nodes.contains_key(&layer.to_node())
} else {
log::error!("ROOT_PARENT should not be part of layers_dragging");
false
}
});
let selected = &tool_data.layers_dragging;
let mut pivot = DVec2::ZERO;
let mut selected = Selected::new(
&mut bounds.original_transforms,
&mut pivot,
selected,
responses,
&document.network_interface,
None,
&ToolType::Select,
None,
);
selected.apply_transformation(bounds.original_bound_transform * transformation * bounds.original_bound_transform.inverse());
}
}
SelectToolFsmState::SkewingBounds
}
(SelectToolFsmState::RotatingBounds, SelectToolMessage::PointerMove(modifier_keys)) => {
if let Some(bounds) = &mut tool_data.bounding_box_manager {
let angle = {
@@ -978,7 +1016,7 @@ impl Fsm for SelectToolFsmState {
SelectToolFsmState::Dragging
}
(SelectToolFsmState::ResizingBounds, SelectToolMessage::PointerOutsideViewport(_)) => {
(SelectToolFsmState::ResizingBounds | SelectToolFsmState::SkewingBounds, SelectToolMessage::PointerOutsideViewport(_)) => {
// AutoPanning
if let Some(shift) = tool_data.auto_panning.shift_viewport(input, responses) {
if let Some(ref mut bounds) = &mut tool_data.bounding_box_manager {
@@ -1081,7 +1119,7 @@ impl Fsm for SelectToolFsmState {
let selection = tool_data.nested_selection_behavior;
SelectToolFsmState::Ready { selection }
}
(SelectToolFsmState::ResizingBounds, SelectToolMessage::DragStop { .. } | SelectToolMessage::Enter) => {
(SelectToolFsmState::ResizingBounds | SelectToolFsmState::SkewingBounds, SelectToolMessage::DragStop { .. } | SelectToolMessage::Enter) => {
let response = match input.mouse.position.distance(tool_data.drag_start) < 10. * f64::EPSILON {
true => DocumentMessage::AbortTransaction,
false => DocumentMessage::EndTransaction,