Skip to content

PdfCraft: An open-source PDF reader and editor written by scratch in pure Rust

fix(ui): seven tools take the page zoom from the side the page's width is on (#4425)

Daniele Lombardi4047e9aaa549
diff --git a/crates/ui-egui/src/calc_order_ui.rs b/crates/ui-egui/src/calc_order_ui.rs
index a9a726d24..894fe1792 100644
--- a/crates/ui-egui/src/calc_order_ui.rs
+++ b/crates/ui-egui/src/calc_order_ui.rs
@@ -752,7 +752,7 @@ pub(crate) fn paint_page(
let pointer = ui.input(|i| i.pointer.hover_pos());
let hovered = pointer.and_then(|p| on_page.iter().rev().find(|(_, r)| r.contains(p))).map(|(n, _)| (*n).to_owned());
let at: HashMap<&str, Rect> = on_page.iter().copied().collect();
- let zoom = (xf.rect.width() / xf.pw.max(1.0)).clamp(0.5, 3.0);
+ let zoom = xf.zoom().clamp(0.5, 3.0);
let focus = if view.hide_links { None } else { view.focus(selected) };
// The focus's links, and the fields at either end of them (with the focus itself).
let shown: Vec<&Link> = focus.as_deref().map(|f| listed.links.iter().filter(|l| l.from == f || l.to == f).collect()).unwrap_or_default();
diff --git a/crates/ui-egui/src/content_ui.rs b/crates/ui-egui/src/content_ui.rs
index d966b04a5..2ac624d3f 100644
--- a/crates/ui-egui/src/content_ui.rs
+++ b/crates/ui-egui/src/content_ui.rs
@@ -510,7 +510,7 @@ pub(crate) fn after_refresh(view: &mut DocView, added: &[Added]) {
pub(crate) fn editor(ctx: &egui::Context, view: &mut DocView, info: &DocInfo, added: &[Added]) -> (Option<Edit>, bool) {
let Some(page) = view.content.draft.as_ref().map(|d| d.page) else { return (None, false) };
let Some(xf) = view.page_xform(page) else { return (None, false) };
- let zoom = xf.rect.width() / xf.pw.max(1.0);
+ let zoom = xf.zoom();
let Some(draft) = view.content.draft.as_mut() else { return (None, false) };
let font = crate::edit_text_ui::editor_font(&draft.style, (draft.style.size as f32 * zoom).clamp(1.0, 300.0));
let text = AddedText { text: draft.text.clone(), ..draft.style.clone() };
diff --git a/crates/ui-egui/src/field_table_ui.rs b/crates/ui-egui/src/field_table_ui.rs
index 82263c210..d9b5255bf 100644
--- a/crates/ui-egui/src/field_table_ui.rs
+++ b/crates/ui-egui/src/field_table_ui.rs
@@ -410,7 +410,7 @@ pub(crate) fn paint_preview(painter: &egui::Painter, xf: &PageXform, page: usize
if preview.page != page {
return;
}
- let zoom = (xf.rect.width() / xf.pw.max(1.0)).clamp(0.5, 3.0);
+ let zoom = xf.zoom().clamp(0.5, 3.0);
let font = theme::regular((9.0 * zoom).clamp(7.0, 13.0));
let on_screen = |r: [f64; 4]| xf.view_rect([r[0] as f32, r[1] as f32, r[2] as f32, r[3] as f32]);
let outline = on_screen(preview.laid.table.rect);
diff --git a/crates/ui-egui/src/fill_sign.rs b/crates/ui-egui/src/fill_sign.rs
index 64c8ee0d4..1684c80be 100644
--- a/crates/ui-egui/src/fill_sign.rs
+++ b/crates/ui-egui/src/fill_sign.rs
@@ -712,7 +712,7 @@ pub(crate) fn type_box(ctx: &egui::Context, view: &mut DocView, info: &DocInfo,
let xf = view.page_xform(tb.page)?;
let v = info.pages.get(tb.page)?.user_to_view(tb.at[0] as f32, tb.at[1] as f32);
let pos = xf.norm_to_screen(v[0] / xf.pw, v[1] / xf.ph);
- let zoom = xf.rect.width() / xf.pw.max(1.0);
+ let zoom = xf.zoom();
let mut commit = false;
let mut cancel = false;
// Shown at once, like the paragraph editor: a fade-in shows the page's copy through it.
diff --git a/crates/ui-egui/src/forms_ui.rs b/crates/ui-egui/src/forms_ui.rs
index 5c3b91a39..760c0b6cb 100644
--- a/crates/ui-egui/src/forms_ui.rs
+++ b/crates/ui-egui/src/forms_ui.rs
@@ -577,7 +577,7 @@ pub(crate) fn overlay(
return None;
};
let rect = widget_rect(&xf, info, page, w.rect);
- let zoom = xf.rect.width() / xf.pw.max(1.0);
+ let zoom = xf.zoom();
let t = Tokens::get(ctx);
let mut edit = None;
let mut close = false;
diff --git a/crates/ui-egui/src/measure_ui.rs b/crates/ui-egui/src/measure_ui.rs
index 658457499..7c675c694 100644
--- a/crates/ui-egui/src/measure_ui.rs
+++ b/crates/ui-egui/src/measure_ui.rs
@@ -208,7 +208,7 @@ pub(crate) fn page_input(
if state.paths.as_ref().is_none_or(|(p, g, _)| *p != page || *g != doc.edit_generation()) {
state.paths = Some((page, doc.edit_generation(), doc.measurement_paths(page)));
}
- let pixels_per_unit = (xf.rect.width() / xf.pw).max(1e-6);
+ let pixels_per_unit = xf.zoom().max(1e-6);
if let Some((_, _, Err(e))) = &state.paths {
state.error = Some(e.clone());
}
diff --git a/crates/ui-egui/src/prepare.rs b/crates/ui-egui/src/prepare.rs
index f3913401a..5833c3838 100644
--- a/crates/ui-egui/src/prepare.rs
+++ b/crates/ui-egui/src/prepare.rs
@@ -543,7 +543,7 @@ pub(crate) fn paint_page(ui: &egui::Ui, painter: &egui::Painter, xf: &PageXform,
let prep = &view.prepare;
let pointer = ui.input(|i| i.pointer.hover_pos());
let grab = prep.grab.filter(|(gp, ..)| *gp == page);
- let zoom = (xf.rect.width() / xf.pw.max(1.0)).clamp(0.5, 3.0);
+ let zoom = xf.zoom().clamp(0.5, 3.0);
for f in form {
for (wi, w) in f.widgets.iter().enumerate().filter(|(_, w)| w.page == Some(page)) {
let mut r = screen_rect(xf, info, page, w.rect);
diff --git a/crates/ui-egui/tests/it/fill_sign.rs b/crates/ui-egui/tests/it/fill_sign.rs
index 88051a9e5..566a14f18 100644
--- a/crates/ui-egui/tests/it/fill_sign.rs
+++ b/crates/ui-egui/tests/it/fill_sign.rs
@@ -237,6 +237,51 @@ fn fill_text_size_resizes_the_selected_text() {
assert!(after > before * 2.0, "36 pt text has a taller box than 10 pt text: {before} -> {after}");
}
+/// The font sizes of the texts `text` drawn in the last frame.
+fn drawn_sizes(h: &Harness<'static, PdfCraftApp>, text: &str) -> Vec<f32> {
+ fn walk(shape: &egui::Shape, text: &str, out: &mut Vec<f32>) {
+ match shape {
+ egui::Shape::Vec(shapes) => shapes.iter().for_each(|s| walk(s, text, out)),
+ egui::Shape::Text(t) if t.galley.text() == text => {
+ out.extend(t.galley.job.sections.first().map(|s| s.format.font_id.size));
+ }
+ _ => {}
+ }
+ }
+ let mut out = Vec::new();
+ for clipped in &h.output().shapes {
+ walk(&clipped.shape, text, &mut out);
+ }
+ out
+}
+
+/// The type box draws its text at the page's zoom whichever way the view is turned. With the
+/// view turned a quarter, the page's width runs down the screen: reading the zoom off the screen
+/// rectangle's width instead made the typed text a height-over-width too large (here 4/3).
+#[test]
+fn the_type_box_text_matches_the_page_zoom_in_a_turned_view() {
+ for rotate in ["0", "90"] {
+ let mut h = harness();
+ h.state_mut().set_option("rotate", rotate).unwrap();
+ h.run_steps(3);
+ h.state_mut().execute("sign.fill.text");
+ click(&mut h, 50.0, 250.0);
+ h.event(egui::Event::Text("Ada".into()));
+ h.run_steps(2);
+ let s = h.state();
+ let page = &s.session.get(s.views[0].id).unwrap().info.pages[0];
+ let rect = s.views[0].page_screen_rect(0).expect("on screen");
+ // Screen pixels per page point: the page's width lies across, or down when turned.
+ let zoom = if rotate == "90" { rect.height() } else { rect.width() } / page.width;
+ let size = s.views[0].fill_text.as_ref().expect("an open type box").size as f32;
+ let drawn = drawn_sizes(&h, "Ada");
+ assert!(!drawn.is_empty(), "{rotate}°: the typed text is drawn");
+ for d in drawn {
+ assert!((d - size * zoom).abs() < 0.5, "{rotate}°: drawn at {d}, the page shows it at {}", size * zoom);
+ }
+ }
+}
+
#[test]
fn the_type_box_grows_as_text_is_typed() {
let mut h = harness();