From 64d8c20584f2cf08c91374ba399a289ecdb1f4fd Mon Sep 17 00:00:00 2001
From: eliets2 <287273517+eliets2@users.noreply.github.com>
Date: Thu, 22 Oct 2026 06:01:23 +0300
Subject: [PATCH 1/2] Leave the page grid when the Crop tool is chosen

Crop is only listed in the Organize pages panel, which is shown together with the thumbnail grid; activating it there must bring the document view back, otherwise the tool is selected but no page is on screen to drag a crop rectangle on.

In the "page.crop" command arm, close the organize grid of the active view before arming the Crop tool, the way opening a page from the grid does. The left panel then falls back to the workspace panel on the next frame, as it already does when the grid closes by other means.

Test: the_crop_tool_leaves_the_page_grid_so_a_page_can_be_cropped failed before the change and passes after.
---
 crates/ui-egui/src/commands.rs       |  3 +++
 crates/ui-egui/tests/it/pageboxes.rs | 29 ++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/crates/ui-egui/src/commands.rs b/crates/ui-egui/src/commands.rs
index 92bc0b360..f908cd423 100644
--- a/crates/ui-egui/src/commands.rs
+++ b/crates/ui-egui/src/commands.rs
@@ -669,6 +669,9 @@ impl PdfCraftApp {
             }
             "page.crop" => {
                 self.quick_tool = crate::QuickTool::Crop;
+                if let Some(v) = active.and_then(|i| self.views.get_mut(i)) {
+                    v.organize = false;
+                }
                 self.notify_tr("Drag a rectangle on a page to crop it; double-click a page for Set Page Boxes");
             }
             "page.boxes" => {
diff --git a/crates/ui-egui/tests/it/pageboxes.rs b/crates/ui-egui/tests/it/pageboxes.rs
index 865f12770..2e2829e05 100644
--- a/crates/ui-egui/tests/it/pageboxes.rs
+++ b/crates/ui-egui/tests/it/pageboxes.rs
@@ -90,3 +90,32 @@ fn duplicate_pages_copies_the_current_page() {
     let s = h.state();
     assert_eq!(s.session.get(s.views[0].id).unwrap().info.pages.len(), 3);
 }
+
+#[test]
+fn the_crop_tool_leaves_the_page_grid_so_a_page_can_be_cropped() {
+    let mut h = harness();
+    // The Organize panel's thumbnail grid is on screen for this view: choosing
+    // "Crop pages" from it must leave the grid so the canvas handles a drag on
+    // a page instead of returning early to organize_grid.
+    h.state_mut().views[0].organize = true;
+    assert!(h.state_mut().execute("page.crop"));
+    assert_eq!(h.state().quick_tool, QuickTool::Crop);
+    assert!(!h.state().views[0].organize, "\"page.crop\" must clear view.organize");
+    h.run_steps(2);
+    let r = h.state().views[0].page_screen_rect(0).unwrap();
+    // The middle half of the page in both directions.
+    let (a, b) = (r.min + r.size() * 0.25, r.min + r.size() * 0.75);
+    h.hover_at(a);
+    h.run_steps(1);
+    h.drag_at(a);
+    h.run_steps(1);
+    for k in 1..=4 {
+        h.hover_at(a + (b - a) * (k as f32 / 4.0));
+        h.run_steps(1);
+    }
+    h.drop_at(b);
+    h.run_steps(4);
+    let (w, hh) = size(&h, 0);
+    assert!((w - 150.0).abs() < 2.0 && (hh - 200.0).abs() < 2.0, "{w}×{hh}");
+    assert_eq!(size(&h, 1), (300.0, 400.0));
+}

From 1481eb1ddab1bea1468da2a10c1bcf77c0abac17 Mon Sep 17 00:00:00 2001
From: eliets2 <287273517+eliets2@users.noreply.github.com>
Date: Fri, 23 Oct 2026 16:39:36 +0300
Subject: [PATCH 2/2] Update ctutils to fix RUSTSEC-2026-0385

---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 47d73be44..2a655a3df 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1291,9 +1291,9 @@ dependencies = [
 
 [[package]]
 name = "ctutils"
-version = "0.4.2"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d5515a3834141de9eafb9717ad39eea8247b5674e6066c404e8c4b365d2a29e"
+checksum = "12218662ccac37d9714f2191252553d67585b97df8c839cbe49e0bde278dc865"
 dependencies = [
  "cmov",
  "subtle",