A drawing app built for agent/human collaboration
Rust
Tiles waiting while the canvas catches up are kept
Indicode BVf661ddab0810
diff --git a/crates/app/src/editor.rs b/crates/app/src/editor.rsindex 86ece5b..1c3083e 100644--- a/crates/app/src/editor.rs+++ b/crates/app/src/editor.rs@@ -2942,8 +2942,8 @@ impl Editor {let mut stroke: Vec<usize> = self.buffer.take_dirty();stroke.extend(self.mirror_buffer.take_dirty());if !self.canvas_current() {- tiles.clear();- stroke.clear();+ self.dirty.extend(std::mem::take(&mut tiles));+ self.dirty.extend(stroke.drain(..));}let refill = self.live.is_none() && tiles.len() > self.batch;if refill {@@ -3911,8 +3911,13 @@ impl Editor {}let id = self.scene.bundle.doc.locate_path(&path).map(|l| l.id.clone());let tinted = self.scene.tint_mask && (self.scene.active_is_mask() || path.last() == Some(&MASK));- self.timeline.kept = (self.canvas_current() && !self.scene.onion_on && !tinted)- .then_some((self.scene.frame, self.scene.bundle.doc.rev));+ if path != self.scene.active {+ self.timeline.kept = (self.canvas_current() && !self.scene.onion_on && !tinted).then_some((+ self.scene.frame,+ self.scene.bundle.doc.rev,+ self.canvas_gen,+ ));+ }self.scene.set_active_later(path);if self.scene.onion_on {self.frames_changed();diff --git a/crates/app/src/editor/timeline.rs b/crates/app/src/editor/timeline.rsindex f1e8e3e..1fba92d 100644--- a/crates/app/src/editor/timeline.rs+++ b/crates/app/src/editor/timeline.rs@@ -98,7 +98,7 @@ pub(super) struct Timeline {moved_at: Instant,step_start: Option<Instant>,pub canvas_frame: Option<u32>,- pub kept: Option<(u32, u64)>,+ pub kept: Option<(u32, u64, u64)>,pub on_screen: Option<u32>,shown_key: Option<u64>,flip: Option<Flip>,@@ -409,7 +409,7 @@ impl Editor {self.frames.heavy |= done.bytes > crate::frames::HEAVY;self.scene.lean = self.frames.heavy;let thumbs = std::mem::take(&mut done.thumbs);- let unchanged = self.timeline.kept.take() == Some((done.frame, self.scene.bundle.doc.rev))+ let unchanged = self.timeline.kept.take() == Some((done.frame, self.scene.bundle.doc.rev, pending.asked))&& self.timeline.canvas_frame == Some(done.frame);if self.scene.adopt(done, wanted) {self.keep_thumbs(thumbs);diff --git a/crates/app/src/editor/ui_tests.rs b/crates/app/src/editor/ui_tests.rsindex b01217d..af90ccb 100644--- a/crates/app/src/editor/ui_tests.rs+++ b/crates/app/src/editor/ui_tests.rs@@ -1278,6 +1278,38 @@ fn a_tap_that_wobbles_selects_and_a_drag_past_three_points_moves() {let _ = std::fs::remove_dir_all(&path);}+#[test]+fn a_layer_made_and_activated_at_once_or_mid_refill_still_draws() {+ let path = sample("made");+ let mut h = harness(editor(&path), vec2(1440.0, 900.0));+ settle(&mut h, |ed| ed.canvas_current() && ed.dirty.is_empty());+ h.state_mut()+ .apply(parse_lines(r#"{"op":"add","layer":{"kind":"vector","name":"late"}}"#).unwrap())+ .unwrap();+ let late = h.state().scene.bundle.doc.find_layer("late").unwrap().id.clone();+ h.state_mut()+ .apply(+ parse_lines(&format!(+ r##"{{"op":"add","node":{{"type":"rect","x":300,"y":200,"w":150,"h":120,"fill":"#2040c0"}},"in":"{late}","frame":0}}"##+ ))+ .unwrap(),+ )+ .unwrap();+ let path_of = |h: &Harness<'static, Editor>, id: &str| match h.state().scene.bundle.doc.locate(id) {+ Some(klad_core::doc::Loc::Layer(path)) => path,+ _ => panic!("no layer {id}"),+ };+ let late_path = path_of(&h, &late);+ h.state_mut().activate(late_path).unwrap();+ canvas_shows_the_committed_picture(&mut h);+ h.state_mut().redraw_canvas();+ let shade = h.state().scene.bundle.doc.find_layer("shade").unwrap().id.clone();+ let shade_path = path_of(&h, &shade);+ h.state_mut().activate(shade_path).unwrap();+ canvas_shows_the_committed_picture(&mut h);+ let _ = std::fs::remove_dir_all(&path);+}+#[test]fn switching_layers_keeps_the_canvas_unless_the_picture_changes() {let path = sample("switch");