DesignCraft: An open-source page and layout design editor written by scratch in pure Rust
rustfmt
moppeeer793e0fc33770
diff --git a/crates/ui-egui/src/canvas/guides.rs b/crates/ui-egui/src/canvas/guides.rsindex 540a295ee..4689b5fb6 100644--- a/crates/ui-egui/src/canvas/guides.rs+++ b/crates/ui-egui/src/canvas/guides.rs@@ -143,7 +143,7 @@ pub(super) fn guide_spot(app: &DesignApp, xf: &Xf, g: &GuideDrag) -> Option<Guidsnap: app.ui.snap_view(),unit: app.ui.units,stroke_in_front: false,- loaded: None,+ loaded: None,};let s = designcraft_tools::snap::snap(&cx,diff --git a/crates/ui-egui/src/canvas/tests.rs b/crates/ui-egui/src/canvas/tests.rsindex de8ae32c9..51d5d32d3 100644--- a/crates/ui-egui/src/canvas/tests.rs+++ b/crates/ui-egui/src/canvas/tests.rs@@ -3,56 +3,56 @@ use egui_kittest::{Harness, kittest::Queryable};use super::*;- /// A place-cursor drag past its 3-point threshold but short of egui's drag distance previews- /// a frame, and the release places that frame: what's shown is what lands.- #[test]- fn a_short_place_cursor_drag_places_the_frame_it_previews() {- let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());- app.run("file.new", json!({})).unwrap();- let png = designcraft_render::Rendered { width: 40, height: 20, pixels: vec![200; 40 * 20 * 4] }.to_png();- app.run("place.load", json!({"base64": designcraft_engine::cmd::base64_encode(&png), "name": "a.png"})).unwrap();- let mut h = Harness::builder().with_size(vec2(1400.0, 900.0)).with_step_dt(1.0 / 60.0).build_ui_state(- |ui, app: &mut DesignApp| {- let ctx = ui.ctx().clone();- app.logic(&ctx);- app.ui(ui);- },- app,- );- h.run_steps(6);- let (from, slot) = {- let app = h.state();- let layout = CanvasLayout::new(&app.session.doc().unwrap().doc, false);- let xf = Xf::new(app.canvas_rect.unwrap(), app.view().unwrap());- (xf.to_screen(layout.slots[0].xf * Point::new(200.0, 200.0)), layout.slots[0].xf)- };- // About 5.4 points: past the place cursor's 3, short of egui's 6.- let to = from + vec2(4.5, 3.0);- assert!((to - from).length() < h.ctx.options(|o| o.input_options.max_click_dist));- h.hover_at(from);- h.event(egui::Event::PointerButton { pos: from, button: egui::PointerButton::Primary, pressed: true, modifiers: egui::Modifiers::NONE });- h.run_steps(1);- h.event(egui::Event::PointerMoved(to));- h.run_steps(2);- let vi = h.state().view_info();- let preview = h- .state_mut()- .session- .overlays(vi)- .into_iter()- .find_map(|o| match o {- designcraft_tools::Overlay::Marquee(r) => Some(r),- _ => None,- })- .expect("the frame is previewed");- h.event(egui::Event::PointerButton { pos: to, button: egui::PointerButton::Primary, pressed: false, modifiers: egui::Modifiers::NONE });- h.run_steps(3);- let placed = h.state().session.doc().unwrap().doc.spreads[0].items.last().expect("placed").bounds();- let shown = slot.inverse().transform_rect_bbox(preview);- for (a, b) in [(placed.x0, shown.x0), (placed.y0, shown.y0), (placed.x1, shown.x1), (placed.y1, shown.y1)] {- assert!((a - b).abs() < 0.01, "placed {placed:?}, previewed {shown:?}");- }+/// A place-cursor drag past its 3-point threshold but short of egui's drag distance previews+/// a frame, and the release places that frame: what's shown is what lands.+#[test]+fn a_short_place_cursor_drag_places_the_frame_it_previews() {+ let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());+ app.run("file.new", json!({})).unwrap();+ let png = designcraft_render::Rendered { width: 40, height: 20, pixels: vec![200; 40 * 20 * 4] }.to_png();+ app.run("place.load", json!({"base64": designcraft_engine::cmd::base64_encode(&png), "name": "a.png"})).unwrap();+ let mut h = Harness::builder().with_size(vec2(1400.0, 900.0)).with_step_dt(1.0 / 60.0).build_ui_state(+ |ui, app: &mut DesignApp| {+ let ctx = ui.ctx().clone();+ app.logic(&ctx);+ app.ui(ui);+ },+ app,+ );+ h.run_steps(6);+ let (from, slot) = {+ let app = h.state();+ let layout = CanvasLayout::new(&app.session.doc().unwrap().doc, false);+ let xf = Xf::new(app.canvas_rect.unwrap(), app.view().unwrap());+ (xf.to_screen(layout.slots[0].xf * Point::new(200.0, 200.0)), layout.slots[0].xf)+ };+ // About 5.4 points: past the place cursor's 3, short of egui's 6.+ let to = from + vec2(4.5, 3.0);+ assert!((to - from).length() < h.ctx.options(|o| o.input_options.max_click_dist));+ h.hover_at(from);+ h.event(egui::Event::PointerButton { pos: from, button: egui::PointerButton::Primary, pressed: true, modifiers: egui::Modifiers::NONE });+ h.run_steps(1);+ h.event(egui::Event::PointerMoved(to));+ h.run_steps(2);+ let vi = h.state().view_info();+ let preview = h+ .state_mut()+ .session+ .overlays(vi)+ .into_iter()+ .find_map(|o| match o {+ designcraft_tools::Overlay::Marquee(r) => Some(r),+ _ => None,+ })+ .expect("the frame is previewed");+ h.event(egui::Event::PointerButton { pos: to, button: egui::PointerButton::Primary, pressed: false, modifiers: egui::Modifiers::NONE });+ h.run_steps(3);+ let placed = h.state().session.doc().unwrap().doc.spreads[0].items.last().expect("placed").bounds();+ let shown = slot.inverse().transform_rect_bbox(preview);+ for (a, b) in [(placed.x0, shown.x0), (placed.y0, shown.y0), (placed.x1, shown.x1), (placed.y1, shown.y1)] {+ assert!((a - b).abs() < 0.01, "placed {placed:?}, previewed {shown:?}");}+}#[test]fn a_press_after_a_drag_is_not_a_double_click() {