PdfCraft: An open-source PDF reader and editor written by scratch in pure Rust
Merge current main into #2155
FredApps29913dcfca0e
diff --cc crates/ui-egui/src/app/prefs.rsindex 191e16b87,7dd9846a7..7d3fd6b94--- a/crates/ui-egui/src/app/prefs.rs+++ b/crates/ui-egui/src/app/prefs.rs@@@ -141,9 -141,9 +141,10 @@@ impl PdfCraftAppv["default_page_gaps"] = serde_json::Value::Bool(self.view_defaults.show_page_gaps);v["fill_text_color"] = serde_json::json!(self.fill_text_color);v["redact_prefs"] = self.redact_defaults.to_json();+ v["pinned_tools"] = serde_json::json!(self.pinned_tools);// Set outside json! above, which is at serde_json's macro recursion limit.v["hide_empty_highlight_hover"] = serde_json::Value::Bool(self.comment_prefs.hide_empty_highlight_hover);+ v["show_page_edge_shadows"] = self.show_page_edge_shadows.into();v["comment_tool_pinned"] = serde_json::Value::Bool(self.comment_prefs.pinned);v["show_secured_notice"] = serde_json::Value::Bool(self.show_secured_notice);v["organize_zoom"] = serde_json::json!(self.organize_zoom);diff --cc crates/ui-egui/src/canvas.rsindex 1319e0087,5625587a6..111aecc55--- a/crates/ui-egui/src/canvas.rs+++ b/crates/ui-egui/src/canvas.rs@@@ -3856,9 -3229,12 +3858,13 @@@ pub fn document_area(app: &mut PdfCraftfill_text_size: app.fill_text_size,fill_text_color: app.fill_text_color,today,+ can_paste_image,};let mut page_out = PageOut::default();+ let fade_strength = ui.spacing().scroll.fade.strength;+ if !app.show_page_edge_shadows {+ ui.spacing_mut().scroll.fade.strength = 0.0;+ }let out = page_scroll(ui, scroll, egui::Id::unique(("page-view-scope", view.id)), |ui, viewport| {draw_pages(ui, viewport, view, &env, &mut page_out, &mut app.signature_preview)});