From 5e69e620a32f77f6f959b6a314ba40be545c297b Mon Sep 17 00:00:00 2001
From: mtlcl410 <2368091+mtlcl410@users.noreply.github.com>
Date: Mon, 19 Oct 2026 02:07:36 +0800
Subject: [PATCH] M12: the last view remembers the two-page cover setting
 (#1767)

Review follow-up on #2195.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 crates/ui-egui/src/last_view.rs | 20 +++++++++++++++-----
 crates/ui-egui/tests/it/ui.rs   |  5 +++--
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/crates/ui-egui/src/last_view.rs b/crates/ui-egui/src/last_view.rs
index ad40ec25ed..b575d4a39c 100644
--- a/crates/ui-egui/src/last_view.rs
+++ b/crates/ui-egui/src/last_view.rs
@@ -1,7 +1,7 @@
 //! Restore last view settings when reopening documents (Acrobat's Preferences ▸ Documents
-//! option; #1767): the page, zoom and page display a file was last shown with, remembered by
-//! its path when its tab is closed or settings are saved, and applied when the file is opened
-//! again. Desktop only: a document without a file has nothing to be found by.
+//! option; #1767): the page, zoom and page display (with the two-page cover setting) a file was
+//! last shown with, remembered by its path when its tab is closed or settings are saved, and
+//! applied when the file is opened again. Desktop only: a document without a file has nothing to be found by.
 
 use serde::Serialize;
 
@@ -22,6 +22,8 @@ pub struct LastView {
     pub zoom: String,
     /// The page display token (`canvas::display_token`).
     pub display: String,
+    /// Whether two-page view showed a cover page (the first page on its own).
+    pub cover: bool,
 }
 
 /// As `last_session` keys files (and the web has no paths to remember).
@@ -41,7 +43,13 @@ impl PdfCraftApp {
         let view = self.views.get(index)?;
         let path = self.session.get(view.id)?.path.as_deref()?;
         let zoom = ViewDefaults { fit: view.fit, zoom: view.zoom, ..ViewDefaults::default() }.zoom_name();
-        Some(LastView { path: absolute(path), page: view.current, zoom, display: canvas::display_token(view.layout, view.continuous).to_string() })
+        Some(LastView {
+            path: absolute(path),
+            page: view.current,
+            zoom,
+            display: canvas::display_token(view.layout, view.continuous).to_string(),
+            cover: view.cover,
+        })
     }
 
     /// Remember how view `index` shows its document (when its tab closes).
@@ -78,7 +86,8 @@ impl PdfCraftApp {
                 let zoom = e["zoom"].as_str().filter(|z| ViewDefaults::default().with_zoom(z).is_some())?.to_string();
                 let display = e["display"].as_str().filter(|d| canvas::parse_display_token(d).is_some())?.to_string();
                 let page = usize::try_from(e["page"].as_u64().unwrap_or(0)).unwrap_or(0);
-                Some(LastView { path, page, zoom, display })
+                let cover = e["cover"].as_bool().unwrap_or(false);
+                Some(LastView { path, page, zoom, display, cover })
             })
             .collect();
     }
@@ -99,6 +108,7 @@ impl PdfCraftApp {
         if let Some((layout, continuous)) = canvas::parse_display_token(&last.display) {
             view.set_display(layout, continuous);
         }
+        view.set_cover(last.cover);
         if let Some(defaults) = ViewDefaults::default().with_zoom(&last.zoom) {
             match defaults.fit {
                 canvas::Fit::None => view.set_zoom(defaults.zoom),
diff --git a/crates/ui-egui/tests/it/ui.rs b/crates/ui-egui/tests/it/ui.rs
index 604eb8178f..03db16ce7f 100644
--- a/crates/ui-egui/tests/it/ui.rs
+++ b/crates/ui-egui/tests/it/ui.rs
@@ -1613,6 +1613,7 @@ fn a_file_opened_again_shows_its_last_view() {
         app.set_option("zoom", "50").unwrap();
         let view = &mut app.views[0];
         view.set_display(PageLayout::TwoUp, false);
+        view.set_cover(true);
         view.go_to_page(2);
     }
     h.run_steps(3);
@@ -1627,7 +1628,7 @@ fn a_file_opened_again_shows_its_last_view() {
             app.open_bytes("doc.pdf", Some(p), pages_fixture(3)).expect("opens");
         });
         let v = &h.state().views[0];
-        assert_eq!((v.current, v.fit, v.zoom, v.layout, v.continuous), (2, Fit::None, 0.5, PageLayout::TwoUp, false), "{label}");
+        assert_eq!((v.current, v.fit, v.zoom, v.layout, v.continuous, v.cover), (2, Fit::None, 0.5, PageLayout::TwoUp, false, true), "{label}");
     }
     // The preference off: the defaults.
     let saved = h.state().persist();
@@ -1638,7 +1639,7 @@ fn a_file_opened_again_shows_its_last_view() {
         app.open_bytes("doc.pdf", Some(p), pages_fixture(3)).expect("opens");
     });
     let v = &h.state().views[0];
-    assert_eq!((v.current, v.fit, v.layout, v.continuous), (0, Fit::Width, PageLayout::Single, true));
+    assert_eq!((v.current, v.fit, v.layout, v.continuous, v.cover), (0, Fit::Width, PageLayout::Single, true, false));
     // Garbage in the settings is ignored, a usable entry among it is kept.
     let mut app = PdfCraftApp::new();
     app.restore(&format!(