diff --git a/crates/midra-layout/src/gui.rs b/crates/midra-layout/src/gui.rs index 3056d7c..60e4474 100644 --- a/crates/midra-layout/src/gui.rs +++ b/crates/midra-layout/src/gui.rs @@ -2115,6 +2115,11 @@ impl Editor { } }).response.on_hover_text("Snapping tools and options. Shift: 10 px · Ctrl+Shift: 100 px · Alt: invert snapping."); response.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, "Snapping")); + let chevron = response.rect.right_center() - Vec2::new(8.0, 0.0); + ui.painter().add(egui::Shape::line( + vec![chevron + Vec2::new(-3.0, -2.0), chevron + Vec2::new(0.0, 2.0), chevron + Vec2::new(3.0, -2.0)], + Stroke::new(1.5_f32, palette.text), + )); let center = response.rect.left_center() + Vec2::new(17.0, 0.0); let color = if self.snapping.enabled || self.effective_grid(modifiers).is_some() { palette.cyan @@ -3472,7 +3477,7 @@ fn toolbar_groups(width: f32, captions: bool) -> ([Rect; 15], Vec, f32) { (buttons, groups, y + height) } -const SNAP_MENU_TITLE: &str = " ▾"; +const SNAP_MENU_TITLE: &str = " "; // Match the original toolbar's dark surfaces without changing popup controls. fn toolbar_menu( diff --git a/crates/midra-layout/src/layers_ui.rs b/crates/midra-layout/src/layers_ui.rs index e3ee62d..1809215 100644 --- a/crates/midra-layout/src/layers_ui.rs +++ b/crates/midra-layout/src/layers_ui.rs @@ -1,5 +1,48 @@ use super::*; +fn order_button(ui: &mut egui::Ui, layer: usize, up: bool, enabled: bool) -> egui::Response { + ui.add_enabled_ui(enabled, |ui| { + let (_, rect) = ui.allocate_space(Vec2::splat(24.0)); + let response = ui.interact( + rect, + egui::Id::new(("layer-order", layer, up)), + egui::Sense::click(), + ); + response.widget_info(|| { + egui::WidgetInfo::labeled( + egui::WidgetType::Button, + enabled, + if up { "Move up" } else { "Move down" }, + ) + }); + let visuals = ui.style().interact(&response); + ui.painter().rect( + rect, + visuals.corner_radius, + visuals.weak_bg_fill, + visuals.bg_stroke, + egui::StrokeKind::Inside, + ); + let center = rect.center(); + let direction = if up { -1.0 } else { 1.0 }; + let tip = center + Vec2::new(0.0, 5.0 * direction); + ui.painter().line_segment( + [center - Vec2::new(0.0, 5.0 * direction), tip], + visuals.fg_stroke, + ); + ui.painter().add(egui::Shape::line( + vec![ + tip + Vec2::new(-4.0, -4.0 * direction), + tip, + tip + Vec2::new(4.0, -4.0 * direction), + ], + visuals.fg_stroke, + )); + response + }) + .inner +} + #[derive(Clone, Copy)] pub(super) struct LayerDrag(pub usize); @@ -264,8 +307,8 @@ impl Editor { if self.layer_ui.folder_filter.as_ref().is_some_and(|folder| *folder != self.layout.layer_info(i).folder) { continue; } ui.horizontal(|ui| { let unfiltered = self.layer_ui.folder_filter.is_none(); - if ui.add_enabled(unfiltered && i + 1 < self.layout.layers().len(), egui::Button::new("↑")).on_hover_text("Move up / bring forward").on_disabled_hover_text("Show all folders to reorder; the top layer cannot move up.").clicked() { reorder = Some((*id, i + 1)); } - if ui.add_enabled(unfiltered && i > 0, egui::Button::new("↓")).on_hover_text("Move down / send backward").on_disabled_hover_text("Show all folders to reorder; the bottom layer cannot move down.").clicked() { reorder = Some((*id, i - 1)); } + if order_button(ui, *id, true, unfiltered && i + 1 < self.layout.layers().len()).on_hover_text("Move up / bring forward").on_disabled_hover_text("Show all folders to reorder; the top layer cannot move up.").clicked() { reorder = Some((*id, i + 1)); } + if order_button(ui, *id, false, unfiltered && i > 0).on_hover_text("Move down / send backward").on_disabled_hover_text("Show all folders to reorder; the bottom layer cannot move down.").clicked() { reorder = Some((*id, i - 1)); } }); let selected = self.layout.selection_mask()[i]; if ui.selectable_label(selected, format!("{id:02}")).clicked() { self.layout.toggle(i); sync = true; } @@ -806,7 +849,7 @@ mod tests { #[test] fn manager_commits_names_before_reordering_and_undo_keeps_alignment_identity() { - use super::super::tests::click_text; + use super::super::tests::{frame, mouse}; let ctx = egui::Context::default(); let mut app = Editor { align_target: AlignTarget::Layer(0), @@ -814,7 +857,19 @@ mod tests { }; app.manage_layers(); app.layer_ui.drafts[0].1 = "Camera".into(); - click_text(&mut app, &ctx, "↓"); + frame(&mut app, &ctx, vec![]); + frame(&mut app, &ctx, vec![]); + let pos = ctx + .read_response(egui::Id::new(("layer-order", 1_usize, false))) + .unwrap() + .rect + .center(); + frame( + &mut app, + &ctx, + vec![egui::Event::PointerMoved(pos), mouse(pos, true)], + ); + frame(&mut app, &ctx, vec![mouse(pos, false)]); assert_eq!(app.layout.layer_info(1).id, 2); assert_eq!(app.layout.layer_info(1).name, "Camera"); assert_eq!(app.layer_ui.drafts[1].1, "Camera"); diff --git a/docs/midralayout/changelog.md b/docs/midralayout/changelog.md index b662c43..a1acf13 100644 --- a/docs/midralayout/changelog.md +++ b/docs/midralayout/changelog.md @@ -4,6 +4,8 @@ ## Unreleased +- Draw the snapping dropdown chevron and layer order arrows as vector icons, avoiding missing font glyphs while preserving tooltips, disabled states and button accessibility. + - Default Midra transfers to All layers with a shared All/Selected/Folder selector. Folder mode follows clicked folders for quick alternate-layout sends/loads; links remain editable and out-of-scope links are preserved. Import suggests saved links and saves remapped/new-layer links and folder membership atomically with geometry. Tests cover scope isolation, reused destinations, in-flight reads and Undo; no hardware writes were needed. - Organize the flat layer sidebar into collapsible folder groups: select contents, double-click rename, group eye/lock controls, drag layers between folders/root, and reorder folders as blocks. Add new-folder and right-click actions, with atomic Undo and existing project compatibility; empty groups disappear and nesting is not introduced.