PdfCraft: An open-source PDF reader and editor written by scratch in pure Rust
refactor(ui): remove update_image_crop, which only its test called
FredAppsd1cba7fdd1f4
diff --git a/crates/ui-egui/src/tools/content_ui.rs b/crates/ui-egui/src/tools/content_ui.rsindex 7e5250253..3fe2bf1df 100644--- a/crates/ui-egui/src/tools/content_ui.rs+++ b/crates/ui-egui/src/tools/content_ui.rs@@ -1307,64 +1307,6 @@ pub(crate) fn image_panel(ui: &mut egui::Ui, t: &Tokens, img: &pdfcraft_engine::out}-/// Update an added image's crop box and adjust its rect dimensions immediately.-pub fn update_image_crop(img: &mut pdfcraft_engine::AddedImage, new_crop: [f64; 4]) {- let new_crop = [new_crop[0].clamp(0.0, 0.95), new_crop[1].clamp(0.0, 0.95), new_crop[2].clamp(0.0, 0.95), new_crop[3].clamp(0.0, 0.95)];- if new_crop != img.crop {- let [old_l, old_b, old_r, old_t] = img.crop.map(|v| v.clamp(0.0, 0.95));- let old_cw = (1.0 - old_l - old_r).max(0.05);- let old_ch = (1.0 - old_b - old_t).max(0.05);-- let [new_l, new_b, new_r, new_t] = new_crop;- let new_cw = (1.0 - new_l - new_r).max(0.05);- let new_ch = (1.0 - new_b - new_t).max(0.05);-- let [x0, y0, x1, y1] =- [img.rect[0].min(img.rect[2]), img.rect[1].min(img.rect[3]), img.rect[0].max(img.rect[2]), img.rect[1].max(img.rect[3])];- let current_w = x1 - x0;- let current_h = y1 - y0;-- let base_w = current_w / old_cw;- let base_h = current_h / old_ch;-- let new_w = base_w * new_cw;- let new_h = base_h * new_ch;-- let (ux, uy, vx, vy): (f64, f64, f64, f64) = match img.rotation % 4 {- 1 => (0.0, 1.0, -1.0, 0.0),- 2 => (-1.0, 0.0, 0.0, -1.0),- 3 => (0.0, -1.0, 1.0, 0.0),- _ => (1.0, 0.0, 0.0, 1.0),- };- let (ux, uy) = if img.flip_h { (-ux, -uy) } else { (ux, uy) };- let (vx, vy) = if img.flip_v { (-vx, -vy) } else { (vx, vy) };-- let base_ox = x0- - (base_w * old_l) * ux.max(0.0)- - (base_w * old_r) * (-ux).max(0.0)- - (base_h * old_b) * vx.max(0.0)- - (base_h * old_t) * (-vx).max(0.0);- let base_oy = y0- - (base_w * old_l) * uy.max(0.0)- - (base_w * old_r) * (-uy).max(0.0)- - (base_h * old_b) * vy.max(0.0)- - (base_h * old_t) * (-vy).max(0.0);-- let new_ox = base_ox- + (base_w * new_l) * ux.max(0.0)- + (base_w * new_r) * (-ux).max(0.0)- + (base_h * new_b) * vx.max(0.0)- + (base_h * new_t) * (-vx).max(0.0);- let new_oy = base_oy- + (base_w * new_l) * uy.max(0.0)- + (base_w * new_r) * (-uy).max(0.0)- + (base_h * new_b) * vy.max(0.0)- + (base_h * new_t) * (-vy).max(0.0);-- img.crop = new_crop;- img.rect = [new_ox, new_oy, new_ox + new_w, new_oy + new_h];- }-}/// The editor's layout of added text with character spacing. The page puts the spacing after every/// character, the last of a line included (`latin_width`), while epaint puts it only between/// characters: the wrap width gives up one spacing so both break lines at the same place.diff --git a/crates/ui-egui/tests/it/editing.rs b/crates/ui-egui/tests/it/editing.rsindex 77416ff9f..1921742ea 100644--- a/crates/ui-egui/tests/it/editing.rs+++ b/crates/ui-egui/tests/it/editing.rs@@ -7903,50 +7903,6 @@ fn test_image_context_menu_precedence() {assert!(h.query_all_by_label("Take a snapshot").next().is_none(), "canvas background menu must not trigger");}-#[test]-fn test_crop_updates_rect_instantly() {- let mut png = Vec::new();- image::RgbImage::from_pixel(100, 50, image::Rgb([100, 150, 200])).write_to(&mut std::io::Cursor::new(&mut png), image::ImageFormat::Png).unwrap();-- let mut h = Harness::builder().with_size(egui::vec2(1400.0, 900.0)).build_eframe(move |_cc| {- let mut app = PdfCraftApp::new();- app.set_option("language", "en").unwrap();- app.open_bytes("form.pdf", None, include_bytes!("../data/form.pdf").to_vec()).unwrap();- app- });- h.run_steps(4);- assert!(h.state_mut().execute("edit.text"));- h.run_steps(2);-- // Add image via content_ui- h.state_mut().add_image("logo.png".into(), png);- h.run_steps(3);-- let id = h.state().views[0].id;- let initial_img = match &h.state().session.get(id).unwrap().added()[0].content {- pdfcraft_engine::AddedContent::Image(img) => img.clone(),- _ => panic!("expected AddedContent::Image"),- };- let initial_w = initial_img.rect.width();-- // Trigger a crop event that removes 50% of an image's width- let mut cropped = initial_img.clone();- pdfcraft_ui_egui::content_ui::update_image_crop(&mut cropped, [0.5, 0.0, 0.0, 0.0]);- let update_edit = pdfcraft_engine::Edit::UpdateContent { page: 0, index: 0, content: pdfcraft_engine::AddedContent::Image(cropped) };- h.state_mut().apply_edit(update_edit);-- // Assert that in the immediate next frame, the image.rect.width() is exactly 50% of the original, with no padding left over- h.run_steps(1);- let doc = h.state().session.get(id).unwrap();- let img = match &doc.added()[0].content {- pdfcraft_engine::AddedContent::Image(img) => img.clone(),- _ => panic!("expected AddedContent::Image"),- };- let w = img.rect.width();- let expected_w = initial_w * 0.5;- assert!((w - expected_w).abs() < 1e-3, "image.rect.width() must be exactly 50% ({expected_w}), got {w}");-}-#[test]fn crop_action_pills_interactive_and_apply_cancel_reset() {let mut png = Vec::new();