A drawing app built for agent/human collaboration
Rust
A: the selection box shows while it is dragged, also with nothing picked
Indicode BV4331fac1118a
diff --git a/Cargo.lock b/Cargo.lockindex f7f0074..9c519d5 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -1744,7 +1744,7 @@ dependencies = [[[package]]name = "klad-app"-version = "0.1.13"+version = "0.1.14"dependencies = ["anyhow","block2 0.6.2",@@ -1773,7 +1773,7 @@ dependencies = [[[package]]name = "klad-brush"-version = "0.1.13"+version = "0.1.14"dependencies = ["anyhow","bytemuck",@@ -1789,7 +1789,7 @@ dependencies = [[[package]]name = "klad-cli"-version = "0.1.13"+version = "0.1.14"dependencies = ["anyhow","clap",@@ -1815,7 +1815,7 @@ dependencies = [[[package]]name = "klad-core"-version = "0.1.13"+version = "0.1.14"dependencies = ["anyhow","half",@@ -1827,7 +1827,7 @@ dependencies = [[[package]]name = "klad-render"-version = "0.1.13"+version = "0.1.14"dependencies = ["anyhow","bytemuck",diff --git a/Cargo.toml b/Cargo.tomlindex 9109912..a325f0a 100644--- a/Cargo.toml+++ b/Cargo.toml@@ -3,7 +3,7 @@ resolver = "3"members = ["crates/*"][workspace.package]-version = "0.1.13"+version = "0.1.14"edition = "2024"license-file = "LICENSE"repository = "https://github.com/klad-app/klad"diff --git a/crates/app/src/editor.rs b/crates/app/src/editor.rsindex a43ac8d..1e01a80 100644--- a/crates/app/src/editor.rs+++ b/crates/app/src/editor.rs@@ -3451,7 +3451,8 @@ impl Editor {}}if self.tool == Tool::Direct {- self.decorate_points(&painter, view, rect, accent, dark);+ self.decorate_points(&painter, view, rect, accent);+ self.decorate_point_box(&painter, view, rect, accent, dark);}self.decorate_shape(&painter, &|x, y| self.screen(view, rect, vec2(x, y)), accent);self.decorate_typing(&painter, view, rect, accent);@@ -3555,7 +3556,7 @@ impl Editor {}}- fn decorate_points(&self, painter: &egui::Painter, view: View, rect: Rect, accent: Color32, dark: egui::Stroke) {+ fn decorate_points(&self, painter: &egui::Painter, view: View, rect: Rect, accent: Color32) {let (Some(shaped), Some(direct)) = (self.shaped.as_ref(), self.direct.as_ref()) else {return;};@@ -3586,12 +3587,22 @@ impl Editor {});});self.square_points(painter, view, rect, accent, &subs, m, &direct.points);- if let Some(drag) = self.point_drag.filter(|d| matches!(d.grab, PointGrab::Marquee { .. })) {- let (a, b) = (self.screen(view, rect, drag.start), self.screen(view, rect, drag.now));- let area = Rect::from_two_pos(a, b);- painter.rect_stroke(area, 0.0, dark, egui::StrokeKind::Middle);- painter.rect_stroke(area, 0.0, thin, egui::StrokeKind::Middle);- }+ }++ fn point_box(&self) -> Option<(Vec2, Vec2)> {+ self.point_drag+ .filter(|d| matches!(d.grab, PointGrab::Marquee { .. }))+ .map(|d| (d.start, d.now))+ }++ fn decorate_point_box(&self, painter: &egui::Painter, view: View, rect: Rect, accent: Color32, dark: egui::Stroke) {+ let Some((start, now)) = self.point_box() else {+ return;+ };+ let area = Rect::from_two_pos(self.screen(view, rect, start), self.screen(view, rect, now));+ painter.rect_filled(area, 0.0, accent.gamma_multiply(0.12));+ painter.rect_stroke(area, 0.0, dark, egui::StrokeKind::Outside);+ painter.rect_stroke(area, 0.0, egui::Stroke::new(1.5, accent), egui::StrokeKind::Middle);}fn outline_points(diff --git a/crates/app/src/editor/ui_tests.rs b/crates/app/src/editor/ui_tests.rsindex 50bab1d..b74a6b3 100644--- a/crates/app/src/editor/ui_tests.rs+++ b/crates/app/src/editor/ui_tests.rs@@ -2653,7 +2653,19 @@ fn a_shift_box_picks_the_points_of_every_shape_on_the_layer_and_they_move_togeth};assert!(h.state().direct.is_none());h.event(egui::Event::ModifiersChanged(Modifiers::SHIFT));- drag(&mut h, at(190.0, 140.0), at(410.0, 170.0));+ h.hover_at(at(190.0, 140.0));+ h.run_steps(1);+ h.drag_at(at(190.0, 140.0));+ h.run_steps(1);+ h.hover_at(at(300.0, 160.0));+ h.run_steps(2);+ let shown = h.state().point_box().expect("the box shows with nothing picked");+ assert!((shown.1.x - shown.0.x - 110.0).abs() < 2.0, "{shown:?}");+ h.hover_at(at(410.0, 170.0));+ h.run_steps(1);+ h.drop_at(at(410.0, 170.0));+ h.run_steps(1);+ assert!(h.state().point_box().is_none());h.event(egui::Event::ModifiersChanged(Modifiers::NONE));h.run_steps(2);let mut both = vec![(left.clone(), 2), (right.clone(), 2)];diff --git a/crates/app/src/home.rs b/crates/app/src/home.rsindex 53ead48..1a5334c 100644--- a/crates/app/src/home.rs+++ b/crates/app/src/home.rs@@ -786,7 +786,8 @@ mod tests {h.key_press_modifiers(Modifiers::COMMAND, Key::N);h.run_steps(6);recent_scrolls_sideways(&mut h, 1600.0);- std::fs::remove_dir_all(&dir).unwrap();+ drop(h);+ let _ = std::fs::remove_dir_all(&dir);}#[test]