263 lines
11 KiB
Rust
263 lines
11 KiB
Rust
//! Pointer regressions for shape-aware, exclusive whiteboard selection.
|
|
use egui::{Context, Event, Modifiers, PointerButton, Pos2, RawInput, Rect};
|
|
use notescraft_ui_egui::{
|
|
motion,
|
|
theme::Tokens,
|
|
whiteboard_view::{WhiteboardView, show_whiteboard},
|
|
};
|
|
use notescraft_whiteboard::{Element, ElementKind, Whiteboard};
|
|
|
|
struct Scene {
|
|
ctx: Context,
|
|
tokens: Tokens,
|
|
view: WhiteboardView,
|
|
board: Whiteboard,
|
|
}
|
|
impl Scene {
|
|
fn new(elements: Vec<Element>) -> Self {
|
|
let ctx = Context::default();
|
|
motion::set_enabled(&ctx, false);
|
|
let mut scene = Self {
|
|
ctx,
|
|
tokens: Tokens::new(notescraft_themes::builtin("catppuccin-mocha").unwrap()),
|
|
view: WhiteboardView::default(),
|
|
board: Whiteboard::new(),
|
|
};
|
|
for element in elements {
|
|
scene.board.add(element);
|
|
}
|
|
scene.frame(vec![], Modifiers::NONE);
|
|
scene.frame(vec![], Modifiers::NONE);
|
|
scene
|
|
}
|
|
fn frame(&mut self, mut events: Vec<Event>, modifiers: Modifiers) {
|
|
events.insert(0, Event::ModifiersChanged(modifiers));
|
|
let input = RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, egui::vec2(1440.0, 900.0))), events, ..RawInput::default() };
|
|
let mut output = self.ctx.run_ui(input, |ui| {
|
|
show_whiteboard(ui, &self.tokens, &mut self.view, &mut self.board);
|
|
});
|
|
output.textures_delta.clear();
|
|
}
|
|
fn gesture(&mut self, from: Pos2, to: Pos2, modifiers: Modifiers) {
|
|
self.frame(vec![Event::PointerMoved(from), Event::PointerButton { pos: from, button: PointerButton::Primary, pressed: true, modifiers }], modifiers);
|
|
if from != to {
|
|
self.frame(vec![Event::PointerMoved(to)], modifiers);
|
|
}
|
|
self.frame(vec![Event::PointerButton { pos: to, button: PointerButton::Primary, pressed: false, modifiers }], modifiers);
|
|
}
|
|
fn click(&mut self, point: Pos2, modifiers: Modifiers) {
|
|
self.gesture(point, point, modifiers);
|
|
}
|
|
}
|
|
fn shape(id: &str, kind: ElementKind, x: f64, y: f64) -> Element {
|
|
let mut element = Element::new(id.into(), kind);
|
|
element.x = x;
|
|
element.y = y;
|
|
element.width = 100.0;
|
|
element.height = 100.0;
|
|
element.background_color = "#89b4fa".into();
|
|
element
|
|
}
|
|
fn rect(id: &str, x: f64, y: f64) -> Element {
|
|
shape(id, ElementKind::Rectangle, x, y)
|
|
}
|
|
#[test]
|
|
fn click_selects_exactly_one() {
|
|
let mut scene = Scene::new(vec![rect("a", 100.0, 200.0), rect("b", 300.0, 200.0)]);
|
|
scene.click(egui::pos2(150.0, 250.0), Modifiers::NONE);
|
|
assert_eq!(scene.view.selected_ids, ["a"]);
|
|
}
|
|
#[test]
|
|
fn overlapping_topmost_wins() {
|
|
let mut scene = Scene::new(vec![rect("a", 100.0, 200.0), rect("b", 120.0, 220.0)]);
|
|
scene.click(egui::pos2(150.0, 250.0), Modifiers::NONE);
|
|
assert_eq!(scene.view.selected_ids, ["b"]);
|
|
}
|
|
#[test]
|
|
fn transparent_rectangle_interior_is_empty() {
|
|
let mut element = rect("a", 100.0, 200.0);
|
|
element.background_color = "transparent".into();
|
|
let mut scene = Scene::new(vec![element]);
|
|
scene.click(egui::pos2(150.0, 250.0), Modifiers::NONE);
|
|
assert_eq!(scene.view.selected_ids, Vec::<String>::new());
|
|
}
|
|
#[test]
|
|
fn transparent_outline_is_selectable() {
|
|
let mut element = rect("a", 100.0, 200.0);
|
|
element.background_color = "transparent".into();
|
|
let mut scene = Scene::new(vec![element]);
|
|
scene.click(egui::pos2(102.0, 250.0), Modifiers::NONE);
|
|
assert_eq!(scene.view.selected_ids, ["a"]);
|
|
}
|
|
#[test]
|
|
fn gap_clears_selection() {
|
|
let mut scene = Scene::new(vec![rect("a", 100.0, 200.0), rect("b", 240.0, 200.0)]);
|
|
scene.view.selected_ids = vec!["a".into(), "b".into()];
|
|
scene.click(egui::pos2(220.0, 250.0), Modifiers::NONE);
|
|
assert_eq!(scene.view.selected_ids, Vec::<String>::new());
|
|
}
|
|
#[test]
|
|
fn tiny_jitter_remains_click() {
|
|
let mut scene = Scene::new(vec![rect("a", 100.0, 200.0), rect("b", 240.0, 200.0)]);
|
|
scene.gesture(egui::pos2(150.0, 250.0), egui::pos2(152.0, 251.0), Modifiers::NONE);
|
|
assert_eq!(scene.view.selected_ids, ["a"]);
|
|
assert_eq!(scene.board.elements.first().unwrap().x, 100.0);
|
|
}
|
|
#[test]
|
|
fn shift_click_toggles() {
|
|
let mut scene = Scene::new(vec![rect("a", 100.0, 200.0), rect("b", 300.0, 200.0)]);
|
|
scene.click(egui::pos2(150.0, 250.0), Modifiers::NONE);
|
|
scene.click(egui::pos2(350.0, 250.0), Modifiers::SHIFT);
|
|
assert_eq!(scene.view.selected_ids, ["a", "b"]);
|
|
scene.click(egui::pos2(150.0, 250.0), Modifiers::SHIFT);
|
|
assert_eq!(scene.view.selected_ids, ["b"]);
|
|
}
|
|
#[test]
|
|
fn command_click_toggles() {
|
|
let mut scene = Scene::new(vec![rect("a", 100.0, 200.0), rect("b", 300.0, 200.0)]);
|
|
scene.click(egui::pos2(150.0, 250.0), Modifiers::NONE);
|
|
scene.click(egui::pos2(350.0, 250.0), Modifiers::COMMAND);
|
|
assert_eq!(scene.view.selected_ids, ["a", "b"]);
|
|
scene.click(egui::pos2(150.0, 250.0), Modifiers::COMMAND);
|
|
assert_eq!(scene.view.selected_ids, ["b"]);
|
|
}
|
|
#[test]
|
|
fn modifiers_do_not_stick() {
|
|
let mut scene = Scene::new(vec![rect("a", 100.0, 200.0), rect("b", 300.0, 200.0)]);
|
|
scene.click(egui::pos2(150.0, 250.0), Modifiers::SHIFT);
|
|
scene.click(egui::pos2(350.0, 250.0), Modifiers::NONE);
|
|
assert_eq!(scene.view.selected_ids, ["b"]);
|
|
}
|
|
#[test]
|
|
fn marquee_selects_only_intersections() {
|
|
let mut scene = Scene::new(vec![rect("a", 100.0, 200.0), rect("b", 300.0, 200.0), rect("far", 700.0, 600.0)]);
|
|
scene.gesture(egui::pos2(80.0, 180.0), egui::pos2(320.0, 310.0), Modifiers::NONE);
|
|
assert_eq!(scene.view.selected_ids, ["a", "b"]);
|
|
}
|
|
#[test]
|
|
fn diagonal_line_does_not_hit_bounding_box() {
|
|
let line = shape("line", ElementKind::Line { points: vec![[0.0, 0.0], [100.0, 100.0]] }, 100.0, 200.0);
|
|
let mut scene = Scene::new(vec![line]);
|
|
scene.click(egui::pos2(110.0, 290.0), Modifiers::NONE);
|
|
assert_eq!(scene.view.selected_ids, Vec::<String>::new());
|
|
}
|
|
#[test]
|
|
fn ellipse_corner_is_empty() {
|
|
let mut scene = Scene::new(vec![shape("oval", ElementKind::Ellipse, 100.0, 200.0)]);
|
|
scene.click(egui::pos2(102.0, 202.0), Modifiers::NONE);
|
|
assert_eq!(scene.view.selected_ids, Vec::<String>::new());
|
|
}
|
|
#[test]
|
|
fn diamond_corner_is_empty() {
|
|
let mut scene = Scene::new(vec![shape("diamond", ElementKind::Diamond, 100.0, 200.0)]);
|
|
scene.click(egui::pos2(102.0, 202.0), Modifiers::NONE);
|
|
assert_eq!(scene.view.selected_ids, Vec::<String>::new());
|
|
}
|
|
#[test]
|
|
fn tolerance_is_screen_pixels_at_each_zoom() {
|
|
for zoom in [0.25, 1.0, 4.0] {
|
|
let mut element = rect("a", 200.0, 300.0);
|
|
element.background_color = "transparent".into();
|
|
let mut scene = Scene::new(vec![element]);
|
|
scene.view.zoom = zoom;
|
|
scene.view.pan = [350.0 / zoom - 200.0, 350.0 / zoom - 350.0];
|
|
let edge = egui::pos2(350.0, 350.0);
|
|
scene.click(edge - egui::vec2(5.0, 0.0), Modifiers::NONE);
|
|
assert_eq!(scene.view.selected_ids, ["a"], "zoom {zoom}");
|
|
scene.click(edge - egui::vec2(10.0, 0.0), Modifiers::NONE);
|
|
assert_eq!(scene.view.selected_ids, Vec::<String>::new(), "zoom {zoom}");
|
|
}
|
|
}
|
|
#[test]
|
|
fn deleted_and_locked_are_skipped() {
|
|
let mut locked = rect("locked", 100.0, 200.0);
|
|
locked.locked = true;
|
|
let mut deleted = rect("deleted", 100.0, 200.0);
|
|
deleted.is_deleted = true;
|
|
let mut scene = Scene::new(vec![rect("a", 100.0, 200.0), locked, deleted]);
|
|
scene.click(egui::pos2(150.0, 250.0), Modifiers::NONE);
|
|
assert_eq!(scene.view.selected_ids, ["a"]);
|
|
}
|
|
|
|
#[test]
|
|
fn group_click_selects_group_only() {
|
|
let mut first = rect("a", 100.0, 200.0);
|
|
first.group_ids = vec!["group".into()];
|
|
let mut second = rect("b", 300.0, 200.0);
|
|
second.group_ids = vec!["group".into()];
|
|
let mut scene = Scene::new(vec![first, second, rect("outside", 500.0, 200.0)]);
|
|
scene.click(egui::pos2(150.0, 250.0), Modifiers::NONE);
|
|
assert_eq!(scene.view.selected_ids, ["a", "b"]);
|
|
}
|
|
#[test]
|
|
fn bound_text_selects_container_and_label() {
|
|
let mut label = shape(
|
|
"label",
|
|
ElementKind::Text {
|
|
text: "label".into(),
|
|
font_size: 20.0,
|
|
font_family: "2".into(),
|
|
text_align: "left".into(),
|
|
vertical_align: "top".into(),
|
|
container_id: Some("a".into()),
|
|
},
|
|
100.0,
|
|
200.0,
|
|
);
|
|
label.width = 50.0;
|
|
label.height = 25.0;
|
|
let mut scene = Scene::new(vec![rect("a", 100.0, 200.0), label, rect("outside", 500.0, 200.0)]);
|
|
scene.click(egui::pos2(125.0, 215.0), Modifiers::NONE);
|
|
assert_eq!(scene.view.selected_ids, ["a", "label"]);
|
|
}
|
|
#[test]
|
|
fn frame_border_selects_its_children_only() {
|
|
let frame = shape("frame", ElementKind::Frame { name: "Frame".into() }, 100.0, 200.0);
|
|
let mut child = rect("child", 120.0, 220.0);
|
|
child.extra.insert("frameId".into(), serde_json::json!("frame"));
|
|
let mut scene = Scene::new(vec![frame, child, rect("outside", 500.0, 200.0)]);
|
|
scene.click(egui::pos2(102.0, 250.0), Modifiers::NONE);
|
|
assert_eq!(scene.view.selected_ids, ["frame", "child"]);
|
|
}
|
|
#[test]
|
|
fn marquee_gap_of_diagonal_path_does_not_select() {
|
|
let line = shape(
|
|
"line",
|
|
ElementKind::Arrow {
|
|
points: vec![[0.0, 0.0], [100.0, 100.0]],
|
|
start_binding: None,
|
|
end_binding: None,
|
|
start_arrowhead: None,
|
|
end_arrowhead: Some("arrow".into()),
|
|
},
|
|
100.0,
|
|
200.0,
|
|
);
|
|
let mut scene = Scene::new(vec![line]);
|
|
scene.gesture(egui::pos2(105.0, 270.0), egui::pos2(120.0, 295.0), Modifiers::NONE);
|
|
assert_eq!(scene.view.selected_ids, Vec::<String>::new());
|
|
}
|
|
|
|
#[test]
|
|
fn drawing_after_reopening_cannot_reuse_existing_element_id() {
|
|
let existing = Element::rectangle(&mut notescraft_whiteboard::IdGen::new(), 100.0, 200.0, 100.0, 100.0);
|
|
let mut scene = Scene::new(vec![existing]);
|
|
scene.view.tool = notescraft_ui_egui::whiteboard_view::WhiteboardTool::Rectangle;
|
|
scene.gesture(egui::pos2(350.0, 400.0), egui::pos2(450.0, 500.0), Modifiers::NONE);
|
|
let ids = scene.board.elements.iter().map(|element| element.id.as_str()).collect::<std::collections::HashSet<_>>();
|
|
assert_eq!(ids.len(), scene.board.elements.len(), "reopened view must not restart IDs already in document");
|
|
scene.view.tool = notescraft_ui_egui::whiteboard_view::WhiteboardTool::Select;
|
|
scene.click(egui::pos2(350.0, 450.0), Modifiers::NONE);
|
|
assert_eq!(scene.board.elements.iter().filter(|element| scene.view.selected_ids.contains(&element.id)).count(), 1);
|
|
}
|
|
#[test]
|
|
fn duplicate_after_reopening_cannot_reuse_existing_element_id() {
|
|
let existing = Element::rectangle(&mut notescraft_whiteboard::IdGen::new(), 100.0, 200.0, 100.0, 100.0);
|
|
let id = existing.id.clone();
|
|
let mut scene = Scene::new(vec![existing]);
|
|
scene.view.selected_ids = vec![id];
|
|
scene.frame(vec![Event::Key { key: egui::Key::D, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::COMMAND }], Modifiers::COMMAND);
|
|
assert_eq!(scene.board.elements.len(), 2);
|
|
assert_ne!(scene.board.elements.first().unwrap().id, scene.board.elements.last().unwrap().id);
|
|
}
|