diff --git a/crates/midra-layout/src/menu_ui.rs b/crates/midra-layout/src/menu_ui.rs index 1edd5cb..e8b872f 100644 --- a/crates/midra-layout/src/menu_ui.rs +++ b/crates/midra-layout/src/menu_ui.rs @@ -90,11 +90,9 @@ impl Editor { &mut self.snapping.screen_edges, "Screen edges, center & quarters", ); - ui.checkbox(&mut self.snapping.grid, "Overlay grid"); ui.checkbox(&mut self.snapping.layer_edges, "Visible layer edges") .on_hover_text("Includes contact between mirrored/opposite resizing layers."); }); - ui.collapsing("Overlay grid settings", |ui| self.overlay_grid_options(ui)); ui.weak("Alt: invert snapping · Shift: 10 px · Ctrl+Shift: 100 px"); } pub(super) fn snapping_menu(&mut self, ui: &mut egui::Ui) { diff --git a/crates/midra-layout/src/preferences_ui.rs b/crates/midra-layout/src/preferences_ui.rs index 2d02911..54e6a93 100644 --- a/crates/midra-layout/src/preferences_ui.rs +++ b/crates/midra-layout/src/preferences_ui.rs @@ -65,6 +65,9 @@ impl Editor { self.snapping_options(ui); ui.weak("Applies to layer movement/resize, not numeric entry or crop-content handles."); ui.separator(); + ui.label("Overlay grid"); + self.overlay_grid_options(ui); + ui.separator(); ui.label("Ctrl: temporarily invert Pivot tool · Drag pivot to position"); ui.label("Double-click pivot: reset to center · Shift/Ctrl+Shift: invert matching grid tool"); ui.label("Arrow keys: move 1 pixel · Shift-arrow: move 10 pixels"); diff --git a/docs/interfaces/midra-layout-settings.md b/docs/interfaces/midra-layout-settings.md index 37e066b..13ccd01 100644 --- a/docs/interfaces/midra-layout-settings.md +++ b/docs/interfaces/midra-layout-settings.md @@ -139,7 +139,7 @@ remain unchanged; explicit 10/100 px grids take precedence. Crop-content resizin is not snapped. Invalid subdivision counts are rejected on settings load. The Grid toolbar icon opens visibility, snapping and subdivision controls; they -also appear in snapping options/preferences. The overlay is drawn above example +also appear in Settings → Editing as a separate Overlay grid section. The overlay is drawn above example artwork and reference pictures, below editable layers, clipped to the output. It is an editor guide, omitted from all project/export artwork. Preferences save immediately and survive project changes; v1–v6 migration does not alter geometry. diff --git a/docs/midra-layout/README.md b/docs/midra-layout/README.md index 616b96c..ebb7c38 100644 --- a/docs/midra-layout/README.md +++ b/docs/midra-layout/README.md @@ -451,7 +451,7 @@ and **Columns / Rows** controls (1–64 each, default 8 × 6). The grid is drawn above reference images and the sample artwork, below layers, across the full output. Subdivisions scale with the output resolution and can fall on fractional pixels. -Enable snapping in the magnet menu and **Overlay grid** to snap layer edges, +Enable snapping in the magnet menu and **Snap to overlay grid** in the Grid menu to snap layer edges, centers, resize handles and pivots to these lines. Showing and snapping are independent; the 10/100 px modifier grids still take precedence. These options are saved in application preferences. The guide is not included in exports. diff --git a/docs/midra-layout/changelog.md b/docs/midra-layout/changelog.md index 6f62304..218ef10 100644 --- a/docs/midra-layout/changelog.md +++ b/docs/midra-layout/changelog.md @@ -4,6 +4,8 @@ ## Unreleased +- Remove duplicate overlay-grid controls from snapping menus; keep them in the adjacent Grid toolbar menu and a separate section in Editing preferences. + - Move the background grid out of the sample artwork into a full-output overlay above reference images. Add a Grid toolbar menu, independent visibility/snapping, and 1–64 columns/rows (default 8 × 6). Persist these preferences in settings v7 with migration from v1–v6; share fractional grid positions across movement, resizing and pivot snapping. Regression tests cover rendering order, toggles, snapping and settings compatibility. - Keep the screen name and output resolution visible with reference images, reserving their fit-screen margin. Viewport tests check label visibility and clipping with and without imported images.