From 94b1b9e0cc8211d3483f4cd4874b6fb0f17ac162 Mon Sep 17 00:00:00 2001 From: Duncan Tourolle Date: Sun, 30 Aug 2026 16:51:41 +0200 Subject: [PATCH] Reconcile what four branches each built separately Three seams, found by the first compile after the merge. Two branches implemented 'can this scope be reordered' independently: one from the collections model, one from the catalog through orders_manually, on every re-read and excluding the trash. The second is the better answer and is what survives; it only needed to set the property app.slint declares. Two lints from scene-mask-ui, which was merged mid-flight and had never been through -D warnings: an is_none check spelled out where clippy wants ?, and a return in a cfg block's tail. Co-Authored-By: Claude Opus 5 (1M context) --- ui/dr-ui/src/develop.rs | 4 +--- ui/dr-ui/src/library_ui.rs | 2 +- ui/dr-ui/src/segmentation.rs | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ui/dr-ui/src/develop.rs b/ui/dr-ui/src/develop.rs index 7ba76ae..e4d3a52 100644 --- a/ui/dr-ui/src/develop.rs +++ b/ui/dr-ui/src/develop.rs @@ -2648,9 +2648,7 @@ impl DevelopSession { // Refuse a category this run did not produce rather than creating a // layer that renders empty: an empty mask looks like a broken // adjustment, where a button that does nothing at least says so. - if seg.category_mask(name).is_none() { - return None; - } + seg.category_mask(name)?; let id = self.graph.masks().next_id(); let mut layer = MaskLayer::new( diff --git a/ui/dr-ui/src/library_ui.rs b/ui/dr-ui/src/library_ui.rs index dbc77c8..89075c7 100644 --- a/ui/dr-ui/src/library_ui.rs +++ b/ui/dr-ui/src/library_ui.rs @@ -2255,7 +2255,7 @@ fn load_window(window: &AppWindow, ctl: &Rc) { // // The trash is never reorderable. It is a view of what was deleted, ordered // by when, and it is not a collection at all. - window.set_library_manual_order( + window.set_library_reorderable( !trash && scope.is_some_and(|c| { dr_catalog::collections::orders_manually(catalog.connection(), c).unwrap_or(false) diff --git a/ui/dr-ui/src/segmentation.rs b/ui/dr-ui/src/segmentation.rs index 013238d..5266cc2 100644 --- a/ui/dr-ui/src/segmentation.rs +++ b/ui/dr-ui/src/segmentation.rs @@ -590,7 +590,7 @@ fn scene_categories( fn load_scene_model() -> Result { #[cfg(feature = "scene-model")] { - return dr_segment::SceneModel::embedded().map_err(|e| e.to_string()); + dr_segment::SceneModel::embedded().map_err(|e| e.to_string()) } #[cfg(not(feature = "scene-model"))] {