A drawing app built for agent/human collaboration
Rust
A lasso picks strokes on every layer when all layers is on
Indicode BV63a47578fcc8
diff --git a/crates/app/src/editor.rs b/crates/app/src/editor.rsindex edbdfee..0b408e5 100644--- a/crates/app/src/editor.rs+++ b/crates/app/src/editor.rs@@ -1837,11 +1837,20 @@ impl Editor {}fn also_cels(&self) -> Vec<(String, String)> {+ self.pick_cels(false)+ }++ fn pick_cels(&self, every: bool) -> Vec<(String, String)> {let doc = &self.scene.bundle.doc;- self.also- .iter()- .filter_map(|id| doc.layer(id))+ let active = self.scene.active_id();+ let layers: Vec<&klad_core::doc::Layer> = match every {+ true => doc.all_layers(),+ false => self.also.iter().filter_map(|id| doc.layer(id)).collect(),+ };+ layers+ .into_iter().filter(|l| l.kind() == Kind::Paint && l.visible && !l.locked)+ .filter(|l| !every || active.as_deref() != Some(l.id.as_str())).filter_map(|l| l.content_at(self.scene.frame).map(|c| (l.id.clone(), c.id.clone()))).collect()}@@ -1859,6 +1868,14 @@ impl Editor {{self.activate(path)?;}+ let every = !click && self.settings.pick_all_layers;+ if every+ && self.scene.active_cel().is_none()+ && let Some((layer, _)) = self.pick_cels(true).into_iter().next()+ && let Some(klad_core::doc::Loc::Layer(path)) = self.scene.bundle.doc.locate(&layer)+ {+ self.activate(path)?;+ }let Some(cel) = self.scene.active_cel() else {self.say(Tone::Refused, "make a paint layer active to select its strokes");return Ok(());@@ -1889,7 +1906,7 @@ impl Editor {};let (found, crossing) = pick(self.scene.active_marks());let others: Vec<(String, String, Vec<u32>, bool)> = self- .also_cels()+ .pick_cels(every).into_iter().map(|(layer, cel)| {let (ids, crossing) = pick(self.scene.marks_of(&cel));diff --git a/crates/app/src/editor/ui_tests.rs b/crates/app/src/editor/ui_tests.rsindex bdf3aca..aca0b2e 100644--- a/crates/app/src/editor/ui_tests.rs+++ b/crates/app/src/editor/ui_tests.rs@@ -268,6 +268,46 @@ fn click_with(h: &mut Harness<'static, Editor>, at: egui::Pos2, modifiers: Modifh.run_steps(2);}+#[test]+fn a_lasso_picks_strokes_on_every_layer_when_all_layers_is_on() {+ let path = sample("lasso-all");+ Bundle::open(&path)+ .unwrap()+ .apply(&parse_lines(r#"{"op":"stroke","layer":"l5","path":"M200 300 L300 320","size":6}"#).unwrap())+ .unwrap();+ let mut h = harness(editor(&path), vec2(1440.0, 1000.0));+ activate(&mut h, "lines");+ h.key_press(Key::S);+ h.run_steps(2);+ let lasso = |h: &mut Harness<'static, Editor>| {+ let corners = [(5.0, 5.0), (505.0, 5.0), (505.0, 379.0), (5.0, 379.0), (5.0, 10.0)];+ let at: Vec<egui::Pos2> = corners.iter().map(|(x, y)| canvas_at(h, *x, *y)).collect();+ h.hover_at(at[0]);+ h.run_steps(1);+ h.drag_at(at[0]);+ h.run_steps(1);+ at[1..].iter().for_each(|p| {+ h.hover_at(*p);+ h.run_steps(1);+ });+ h.drop_at(at[4]);+ h.run_steps(2);+ };+ h.state_mut().settings.pick_all_layers = true;+ lasso(&mut h);+ let picked = h.state().picked.clone().expect("the lasso picks");+ assert_eq!(picked.ids.len(), 2, "both strokes on lines");+ assert_eq!(picked.more.len(), 1, "and the stroke on colour");+ h.key_press(Key::Escape);+ h.run_steps(2);+ h.state_mut().picked = None;+ h.state_mut().settings.pick_all_layers = false;+ lasso(&mut h);+ let picked = h.state().picked.clone().expect("the lasso picks");+ assert!(picked.more.is_empty(), "this layer only: {picked:?}");+ let _ = std::fs::remove_dir_all(&path);+}+#[test]fn a_click_picks_the_stroke_you_see_on_any_layer_or_only_on_this_one() {let path = sample("pick-seen");