From e6862f18ae91969a98a0305e272e0971c1d707e8 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Wed, 14 Oct 2026 14:49:10 -0400 Subject: [PATCH] Fix up merged PRs: WordArt warp handles on main's warp catalog and hover hit list - #519's handle test iterated the old `ALL` preset list; main has `CATALOG` now. - The hover hit-test match lists every Hit variant; add #519's Hit::Warp. - Drop the duplicate "tabs" dialog title that #569 and #637 both added. Co-Authored-By: Claude Opus 5.5 --- crates/engine/src/tools.rs | 3 ++- crates/geom/src/warp/tests.rs | 2 +- crates/ui-egui/src/dialogs.rs | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/engine/src/tools.rs b/crates/engine/src/tools.rs index 418c1de4..7dbf9038 100644 --- a/crates/engine/src/tools.rs +++ b/crates/engine/src/tools.rs @@ -1104,7 +1104,8 @@ impl Session { | Hit::Adjust { id, .. } | Hit::LineEnd { id, .. } | Hit::Handle { id, .. } - | Hit::Vertex { id, .. }, + | Hit::Vertex { id, .. } + | Hit::Warp { id, .. }, ) => Some(*id), None => None, }; diff --git a/crates/geom/src/warp/tests.rs b/crates/geom/src/warp/tests.rs index ac231cf0..c04ddd10 100644 --- a/crates/geom/src/warp/tests.rs +++ b/crates/geom/src/warp/tests.rs @@ -281,7 +281,7 @@ fn hostile_adjusts_and_boxes_stay_finite() { #[test] fn every_preset_has_one_handle_per_adjust() { let r = rect(); - for name in ALL { + for name in CATALOG.iter().map(|p| p.id) { let hs = handles(name, &[], r); assert_eq!(hs.len(), adjust_count(name), "{name}"); let defaults = adjust_defaults(name); diff --git a/crates/ui-egui/src/dialogs.rs b/crates/ui-egui/src/dialogs.rs index e3b23245..c3010053 100644 --- a/crates/ui-egui/src/dialogs.rs +++ b/crates/ui-egui/src/dialogs.rs @@ -47,7 +47,6 @@ fn title(id: &str) -> &'static str { "paragraph" => "Paragraph", "tabs" => "Tabs", "font" => "Font", - "tabs" => "Tabs", "about" => "About DeckCraft", "preferences" => "Preferences", "gridOptions" => "Grid Options",