Skip to content

DesignCraft: An open-source page and layout design editor written by scratch in pure Rust

Merge PR #446

Brandon Thomas65cb26e38d7e
diff --cc crates/ui-egui/src/canvas.rs
index ef5ed0ef4,56c482195..40b146f56
--- a/crates/ui-egui/src/canvas.rs
+++ b/crates/ui-egui/src/canvas.rs
@@@ -2520,18 -1937,143 +2652,157 @@@ mod tests
right_click(&mut h, pos2(rect.center().x, rect.min.y - RULER / 2.0));
assert!(h.query_by_label(" Points").is_none());
}
+
+ #[test]
+ fn baseline_grid_lines_are_the_ones_on_the_page() {
+ // A start far above the page used to be walked line by line, without end.
+ for start in [-1e9, -1e17] {
+ let mut far = baseline_grid_lines(start, 12.0, 792.0);
+ assert_eq!((far.next(), far.count()), (Some(8.0), 65));
+ }
+ let lines = |start, increment, height| baseline_grid_lines(start, increment, height).collect::<Vec<_>>();
+ assert_eq!(lines(36.0, 12.0, 72.0), [36.0, 48.0, 60.0], "the bottom edge is not a line");
+ assert_eq!(lines(-30.0, 12.0, 30.0), [6.0, 18.0], "a start above the page keeps its rhythm");
+ assert_eq!(lines(f64::NAN, 12.0, 792.0), [0.0; 0]);
+ assert_eq!(baseline_grid_lines(0.0, 12.0, f64::INFINITY).count(), MAX_BASELINES);
+ }
}
+
+ #[cfg(test)]
+ mod scrollbar_tests {
+ use egui::{Event, Modifiers, PointerButton};
+ use egui_kittest::Harness;
+
+ use super::*;
+ use crate::test_window::{Window, open, wheel};
+
+ fn window() -> Harness<'static, Window> {
+ let mut h = open(DesignApp::new(designcraft_engine::Session::new(), crate::Services::default()), vec2(1440.0, 900.0));
+ // Zoomed in so both axes scroll.
+ set_zoom(&mut h.state_mut().app, 2.0);
+ h.run_steps(3);
+ h
+ }
+
+ fn origin(h: &Harness<'static, Window>) -> Point {
+ h.state().app.view().map(|v| v.origin).unwrap_or_default()
+ }
+
+ /// The scrollbar's track and thumb as the canvas lays them out for the current view, and
+ /// the content pixels per thumb pixel.
+ fn bar(h: &Harness<'static, Window>, vertical: bool) -> (Rect, Rect, f32) {
+ let app = &h.state().app;
+ let rect = app.canvas_rect.unwrap();
+ let st = app.session.active().unwrap();
+ let xf = Xf::new(rect, app.view().unwrap());
+ let cb = xf.rect(CanvasLayout::new(&st.doc, st.editing_parents).pasteboard);
+ let outer = Rect::from_min_max(rect.min, rect.max + vec2(SCROLLBAR, SCROLLBAR));
+ scrollbar_rects(outer, rect, cb, vertical)
+ }
+
+ /// A primary-button drag from `a` to `b` in a few moves, with `mods` held throughout.
+ fn drag(h: &mut Harness<'static, Window>, a: Pos2, b: Pos2, mods: Modifiers) {
+ h.event(Event::ModifiersChanged(mods));
+ h.hover_at(a);
+ h.step();
+ h.event(Event::PointerButton { pos: a, button: PointerButton::Primary, pressed: true, modifiers: mods });
+ h.step();
+ for n in 1..=4 {
+ h.hover_at(a + (b - a) * n as f32 / 4.0);
+ h.step();
+ }
+ h.event(Event::PointerButton { pos: b, button: PointerButton::Primary, pressed: false, modifiers: mods });
+ h.event(Event::ModifiersChanged(Modifiers::NONE));
+ h.run_steps(3);
+ }
+
+ #[test]
+ fn document_views_have_scrollbars_beside_the_view() {
+ let h = window();
+ let rect = h.state().app.canvas_rect.unwrap();
+ for vertical in [true, false] {
+ let r = h.ctx.read_response(egui::Id::new(("canvas_scrollbar", 0u8, vertical))).expect("scrollbar").rect;
+ let (track, thumb, k) = bar(&h, vertical);
+ assert_eq!(r, track);
+ assert!(k > 0.0, "the zoomed-in view scrolls");
+ if vertical {
+ assert_eq!((r.min.x, r.width(), r.min.y, r.max.y), (rect.max.x, SCROLLBAR, rect.min.y, rect.max.y));
+ assert!(thumb.height() < track.height());
+ } else {
+ assert_eq!((r.min.y, r.height(), r.min.x, r.max.x), (rect.max.y, SCROLLBAR, rect.min.x, rect.max.x));
+ assert!(thumb.width() < track.width());
+ }
+ }
+ }
+
+ #[test]
+ fn dragging_a_thumb_pans_and_clicking_the_track_pages() {
+ let mut h = window();
+ let zoom = h.state().app.view().unwrap().zoom;
+ // Vertical thumb: down 40 px moves the view down by 40 thumb pixels' worth of content.
+ let (_, thumb, k) = bar(&h, true);
+ let before = origin(&h);
+ drag(&mut h, thumb.center(), thumb.center() + vec2(0.0, 40.0), Modifiers::NONE);
+ let after = origin(&h);
+ let want = 40.0 * k as f64 / zoom;
+ assert!((after.y - before.y - want).abs() < want * 0.2, "{before:?} → {after:?}, want +{want}");
+ assert_eq!(after.x, before.x);
+ // Horizontal thumb: left 30 px.
+ let (_, thumb, k) = bar(&h, false);
+ drag(&mut h, thumb.center(), thumb.center() - vec2(30.0, 0.0), Modifiers::NONE);
+ let next = origin(&h);
+ let want = 30.0 * k as f64 / zoom;
+ assert!((after.x - next.x - want).abs() < want * 0.2, "{after:?} → {next:?}, want -{want}");
+ assert_eq!(next.y, after.y);
+ // A click on the vertical track above the thumb pages up by one view.
+ let (track, thumb, _) = bar(&h, true);
+ assert!(thumb.min.y - track.min.y > 4.0);
+ crate::test_window::click_at(&mut h, pos2(track.center().x, track.min.y + 2.0));
+ let paged = origin(&h);
+ let view = h.state().app.canvas_rect.unwrap().height() as f64 / zoom;
+ assert!((next.y - paged.y - view).abs() < 0.01, "{next:?} → {paged:?}, want -{view}");
+ }
+
+ #[test]
+ fn scrolling_the_view_moves_the_thumbs() {
+ let mut h = window();
+ let (_, v0, _) = bar(&h, true);
+ let (_, h0, _) = bar(&h, false);
+ let c = h.state().app.canvas_rect.unwrap().center();
+ wheel(&mut h, c, vec2(-50.0, -80.0));
+ let (_, v1, _) = bar(&h, true);
+ let (_, h1, _) = bar(&h, false);
+ assert!(v1.min.y > v0.min.y && h1.min.x > h0.min.x, "{v0:?} → {v1:?}, {h0:?} → {h1:?}");
+ let r = h.ctx.read_response(egui::Id::new(("canvas_scrollbar", 0u8, true))).expect("scrollbar");
+ assert_eq!(r.rect, bar(&h, true).0);
+ }
+
+ #[test]
+ fn alt_drag_while_editing_text_pans_and_keeps_the_caret() {
+ let mut h = window();
+ let app = &mut h.state_mut().app;
+ let rect = app.canvas_rect.unwrap();
+ let xf = Xf::new(rect, app.view().unwrap());
+ // A text frame filling the visible part of the page, with the caret in it.
+ let (a, b) = (xf.to_canvas(rect.min + vec2(20.0, 20.0)), xf.to_canvas(rect.max - vec2(20.0, 20.0)));
+ let r = app.run("frame.create", json!({"rect": [a.x, a.y, b.x, b.y], "content": "text", "text": "Hello brave world"})).unwrap();
+ let sid = r["story"].as_u64().unwrap();
+ app.run("tool.select", json!({"tool": "type"})).unwrap();
+ app.run("text.select", json!({"story": sid, "anchor": 3, "focus": 3})).unwrap();
+ assert!(app.session.wants_text());
+ h.run_steps(2);
+ let caret = h.state().app.session.doc().unwrap().selection.text;
+ let before = origin(&h);
+ let zoom = h.state().app.view().unwrap().zoom;
+ let from = rect.center();
+ drag(&mut h, from, from + vec2(60.0, 40.0), Modifiers::ALT);
+ let after = origin(&h);
+ assert!(after.x < before.x && after.y < before.y, "{before:?} → {after:?}");
+ assert!((before.x - after.x - 60.0 / zoom).abs() < 15.0 / zoom, "{before:?} → {after:?}");
+ assert_eq!(h.state().app.session.doc().unwrap().selection.text, caret);
+ assert!(h.state_mut().app.session.wants_text(), "still editing text");
+ // Without Alt the same drag selects text and leaves the view alone.
+ drag(&mut h, from, from + vec2(60.0, 40.0), Modifiers::NONE);
+ assert_eq!(origin(&h), after);
+ }
+ }