From bf5f2b86d235267f4ef0758c1a9a5bd3f6d1db95 Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Sun, 15 Nov 2026 12:29:34 +0100 Subject: [PATCH] Deselect layers when clicking empty layer-list space --- crates/midra-layout/src/gui.rs | 42 ++++++++++++++++++++++++++++ crates/midra-layout/src/layers_ui.rs | 31 ++++++++++++++++++++ docs/midra-layout/changelog.md | 4 +++ docs/midra-layout/guide/editing.md | 1 + 4 files changed, 78 insertions(+) diff --git a/crates/midra-layout/src/gui.rs b/crates/midra-layout/src/gui.rs index ea82106..57085a9 100644 --- a/crates/midra-layout/src/gui.rs +++ b/crates/midra-layout/src/gui.rs @@ -1243,6 +1243,48 @@ impl Editor { self.import_reference_file(ui.ctx()); } self.layer_tree_header(ui, &ink, w); + // Register the list background before its row controls so they keep priority. + let background = ui.interact( + Rect::from_min_max( + ink.point(0.0, 20.0), + ink.point( + w, + 28.0 + layer_row_count as f32 * 44.0 + + if self.references.is_empty() { + 14.0 + } else { + 0.0 + }, + ), + ), + ui.id().with("layer-list-background"), + egui::Sense::click(), + ); + if background.clicked() + && background.interact_pointer_pos().is_some_and(|pos| { + !rows.iter().enumerate().any(|(index, row)| { + let indent = match row { + layers_ui::TreeRow::Layer(i) + if !self.layout.layer_info(*i).folder.is_empty() => + { + 18.0 + } + _ => 0.0, + }; + Rect::from_min_size( + ink.point(indent, 28.0 + index as f32 * 44.0), + Vec2::new(w - indent, 38.0), + ) + .contains(pos) + }) + }) + { + self.layout.select(None); + self.reference_selected = None; + self.edit_content = false; + self.marquee = None; + self.sync(); + } let mut reorder = None; for (row_index, tree_row) in rows.into_iter().enumerate() { let y = 28.0 + row_index as f32 * 44.0; diff --git a/crates/midra-layout/src/layers_ui.rs b/crates/midra-layout/src/layers_ui.rs index 468f1cc..5565ede 100644 --- a/crates/midra-layout/src/layers_ui.rs +++ b/crates/midra-layout/src/layers_ui.rs @@ -818,6 +818,37 @@ impl Editor { #[cfg(test)] mod tests { use super::*; + #[test] + fn empty_layer_list_space_clears_selection() { + use super::super::tests::{frame, mouse}; + let ctx = egui::Context::default(); + let mut app = Editor::default(); + app.layout.assign_folder(&[1, 2], "Video").unwrap(); + for gap in [false, true] { + click_tree(&mut app, &ctx, egui::Id::new(("folder", "Video"))); + assert_eq!(app.layout.selected_indices(), [0, 1]); + let rect = ctx + .read_response(egui::Id::new(("layer", 2_usize))) + .unwrap() + .rect; + let pos = if gap { + Pos2::new(rect.center().x, rect.bottom() + 3.0) + } else { + Pos2::new(rect.left() - 9.0, rect.center().y) + }; + frame( + &mut app, + &ctx, + vec![egui::Event::PointerMoved(pos), mouse(pos, true)], + ); + frame(&mut app, &ctx, vec![mouse(pos, false)]); + assert!(app.layout.selected_indices().is_empty()); + } + click_tree(&mut app, &ctx, egui::Id::new(("layer", 2_usize))); + assert_eq!(app.layout.selected_indices().len(), 1); + assert_eq!(app.layout.layer_info(app.layout.selected().unwrap()).id, 2); + } + #[test] fn empty_folder_dialog_preserves_selection_and_restores_its_tree_row() { let ctx = egui::Context::default(); diff --git a/docs/midra-layout/changelog.md b/docs/midra-layout/changelog.md index c60e9a3..87ba083 100644 --- a/docs/midra-layout/changelog.md +++ b/docs/midra-layout/changelog.md @@ -4,6 +4,10 @@ ## Unreleased +- Clear layer selection when clicking empty space in the Layers list, including + gaps between rows and the gutter beside folder contents. Regression tests cover + blank clicks and normal folder/layer selection. + - Make the folder icon create an empty folder without moving selected layers; use one tooltip. Both layer-list and viewport Move to folder menus move all selected layers when invoked on a selected layer. Empty folders support rename/delete, diff --git a/docs/midra-layout/guide/editing.md b/docs/midra-layout/guide/editing.md index 0b2b858..841dbd3 100644 --- a/docs/midra-layout/guide/editing.md +++ b/docs/midra-layout/guide/editing.md @@ -7,6 +7,7 @@ The Layers sidebar groups folder members under collapsible folder rows. Click the chevron to expand/collapse; click the folder name to select its visible, unlocked layers. Shift-click adds/removes its contents from the selection. +Click empty space in the Layers list (including the gutter beside folder contents) to deselect all layers. Double-click a folder or layer name to rename it. Folder eye and lock icons apply to every member; Undo restores each member's previous state, including mixed states.