PdfCraft: An open-source PDF reader and editor written by scratch in pure Rust
Fix menu overflow and form pointer handling
Dylan M. Taylor63bc58a3d57e
diff --git a/crates/ui-egui/src/canvas.rs b/crates/ui-egui/src/canvas.rsindex adf22626b..ee556ba4a 100644--- a/crates/ui-egui/src/canvas.rs+++ b/crates/ui-egui/src/canvas.rs@@ -886,6 +886,7 @@ struct PageOut {open_initials: bool,open_signature: bool,open_table: Option<(usize, [f64; 4])>,+ primary_down: bool,refused: Option<String>,stamp_placed: bool,}@@ -1908,6 +1909,7 @@ fn draw_pages(open_initials,open_signature,open_table,+ primary_down: _,refused,stamp_placed,} = page_out;@@ -2081,6 +2083,7 @@ fn draw_pages(open_initials,open_signature,open_table,+ primary_down: ptr.primary_down,refused,stamp_placed,};@@ -2542,7 +2545,7 @@ fn track_scroll<T>(ui: &egui::Ui, view: &mut DocView, out: &egui::containers::sc/// The hover tip, find bar, size hint and the in-place editors drawn over the pages. Whether the/// text editor was finished.-fn frame_overlays(ui: &mut egui::Ui, view: &mut DocView, env: &PageEnv<'_>, hover_text: Option<(Pos2, String)>) -> bool {+fn frame_overlays(ui: &mut egui::Ui, view: &mut DocView, env: &PageEnv<'_>, primary_down: bool, hover_text: Option<(Pos2, String)>) -> bool {let PageEnv { added, author, avail, can_modify, doc, form, info, prefs, t, today, tool, units, unobstructed, .. } = *env;if let Some((pos, text)) = hover_text {// Click-through, as a tooltip is: the pages lose the pointer under anything that isn't.@@ -2566,7 +2569,7 @@ fn frame_overlays(ui: &mut egui::Ui, view: &mut DocView, env: &PageEnv<'_>, hoveview.pending_edit = Some(e);}let text_box = crate::forms_ui::text_box(doc, view, form);- if let Some(e) = crate::forms_ui::overlay(ui.ctx(), view, info, form, text_box.as_ref(), today) {+ if let Some(e) = crate::forms_ui::overlay(ui.ctx(), view, info, form, primary_down, text_box.as_ref(), today) {view.pending_edit = Some(e);}if let Some(e) = crate::fill_sign::type_box(ui.ctx(), view, info, author) {@@ -3077,6 +3080,7 @@ pub fn document_area(app: &mut PdfCraftApp, index: usize, ui: &mut egui::Ui) {open_initials,open_signature,open_table,+ primary_down,mut refused,stamp_placed,} = page_out;@@ -3103,7 +3107,7 @@ pub fn document_area(app: &mut PdfCraftApp, index: usize, ui: &mut egui::Ui) {let pan_held = track_scroll(ui, view, &out, glide);plan_renders(ui, view, info, out.inner, &RenderPlan { visible_pages: &visible_pages, tag, scale, sharp_held, pan_held, hand });- let text_done = frame_overlays(ui, view, &env, hover_text);+ let text_done = frame_overlays(ui, view, &env, primary_down, hover_text);if let Some(why) = view.objects.notice.take() {refused = Some(why);}diff --git a/crates/ui-egui/src/menus.rs b/crates/ui-egui/src/menus.rsindex d7c8bef1c..d5a33aea3 100644--- a/crates/ui-egui/src/menus.rs+++ b/crates/ui-egui/src/menus.rs@@ -254,7 +254,7 @@ fn english(labeled: Labeled<'_>) -> Option<String> {}fn translate(english: &'static str) -> String {- tl!(english).to_owned()+ if english == "⋯" { tl!("More").to_owned() } else { tl!(english).to_owned() }}/// The layouts' own labels (About, Quit, Window…) through the app's translations.diff --git a/crates/ui-egui/src/tools/forms_ui.rs b/crates/ui-egui/src/tools/forms_ui.rsindex 5a5ba3e1a..6bcec6469 100644--- a/crates/ui-egui/src/tools/forms_ui.rs+++ b/crates/ui-egui/src/tools/forms_ui.rs@@ -629,6 +629,7 @@ fn settle_text_editor(ui: &mut egui::Ui,fx: &mut Focus,r: &egui::Response,+ primary_down: bool,laid_out: Option<(std::sync::Arc<egui::Galley>, Pos2)>,fitted: Option<(&form_appearance::TextBox, String)>,) {@@ -653,7 +654,7 @@ fn settle_text_editor(let at = galley.cursor_from_pos(press - pos + vec2(galley.rect.left(), 0.0));st.cursor.set_char_range(Some(egui::text::CCursorRange::one(at)));st.store(ui.ctx(), r.id);- if ui.input(|i| i.pointer.primary_down()) {+ if primary_down {ui.ctx().set_dragged_id(r.id);}}@@ -725,11 +726,12 @@ pub(crate) fn overlay(view: &mut DocView,info: &DocInfo,form: &[FormField],+ primary_down: bool,text_box: Option<&form_appearance::TextBox>,today: (i64, u32, u32),) -> Option<Edit> {let pressed = view.forms.pressed;- if !ctx.input(|i| i.pointer.primary_down()) {+ if !primary_down {view.forms.pressed = false;}let toggle = std::mem::take(&mut view.forms.toggle);@@ -808,7 +810,7 @@ pub(crate) fn overlay(})// The form field's own logical name; not a visual/preordered label..accessible_name(f.name.clone());- settle_text_editor(ui, fx, &r, laid_out, text_box.zip(before));+ settle_text_editor(ui, fx, &r, primary_down, laid_out, text_box.zip(before));let lost = crate::edit_text_ui::lost_focus_once(&r, &mut fx.had_focus);let (enter, esc, tab, shift) = ui.input(|i| {(i.key_pressed(egui::Key::Enter), i.key_pressed(egui::Key::Escape), i.key_pressed(egui::Key::Tab), i.modifiers.shift)