merge-c4: 5.1: LassoTool::outline_operation, the operation the open outline latched at its press

This commit is contained in:
aiongg
2026-11-16 12:34:31 +00:00
parent 8f78c213de
commit dd1dbea3d4
2 changed files with 28 additions and 1 deletions
+7 -1
View File
@@ -255,7 +255,13 @@ impl LassoTool {
/// An outline with the operation New is open: the app hides the selection's ants.
pub fn replaces_selection(&self) -> bool {
self.draft.is_open() && self.operation == SelectionOperation::New
self.outline_operation() == Some(SelectionOperation::New)
}
/// The operation the open outline latched at its first press, whatever is held now (the cursor's badge and the
/// commit agree); `None` while no outline is open.
pub fn outline_operation(&self) -> Option<SelectionOperation> {
self.draft.is_open().then_some(self.operation)
}
}
+21
View File
@@ -608,6 +608,27 @@ fn a_lasso_click_deselects_only_in_new_mode() {
);
}
// The outline keeps the operation its first press latched: Alt at the press over a selection subtracts, and letting go
// of Alt during the drag changes neither the operation the tool reports nor the commit's. No outline, no operation.
#[trial]
fn the_lasso_reports_the_operation_its_outline_latched() {
let mut rig = rig("Lasso", LassoTool::new(), Fake::selected(Rect::new(20.0, 20.0, 100.0, 100.0)));
assert_eq!(rig.tool_mut().tool().outline_operation(), None);
down(&mut rig, (200.0, 150.0), Mods::ALT);
drag_to(&mut rig, (260.0, 150.0), Mods::ALT);
assert_eq!(rig.tool_mut().tool().outline_operation(), Some(SelectionOperation::Subtract));
for point in [(260.0, 200.0), (230.0, 220.0)] {
drag_to(&mut rig, point, NONE);
}
assert_eq!(rig.tool_mut().tool().outline_operation(), Some(SelectionOperation::Subtract), "Alt let go keeps the latched operation");
up(&mut rig, (200.0, 200.0), NONE);
assert!(
matches!(rig.tool_mut().events().as_slice(), [SelectEvent::Commit { operation: SelectionOperation::Subtract, .. }]),
"the commit subtracts"
);
assert_eq!(rig.tool_mut().tool().outline_operation(), None, "the closed outline has no operation");
}
// ---- the Polygonal Lasso ----
// Shift turns a segment to 45 degree steps from the last vertex, not for the first vertex and not with Alt.