From 5408ead05676f383abdf76980ecd44bc5da07d3e Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Sat, 14 Nov 2026 13:08:57 +0100 Subject: [PATCH] Swap default layer labels without changing stacking --- crates/midra-layout/src/device_send.rs | 20 +++--- crates/midra-layout/src/gui.rs | 14 ++-- crates/midra-layout/src/layers_ui.rs | 26 ++++---- crates/midra-layout/src/lib.rs | 8 +-- crates/midra-layout/tests/layers.rs | 64 ++++++++++--------- crates/midra-layout/tests/project.rs | 29 +++++---- .../midra-layout-recovery-v1.example.json | 54 ++++++++-------- docs/interfaces/midra-layout-v9.example.json | 54 ++++++++-------- docs/interfaces/midra-layout.md | 4 +- docs/midralayout/changelog.md | 2 + 10 files changed, 143 insertions(+), 132 deletions(-) diff --git a/crates/midra-layout/src/device_send.rs b/crates/midra-layout/src/device_send.rs index c004104..4b628cb 100644 --- a/crates/midra-layout/src/device_send.rs +++ b/crates/midra-layout/src/device_send.rs @@ -336,7 +336,7 @@ mod tests { let l = layout(); for (strategy, expected_width) in [(Sizing::OutputBox, 300), (Sizing::SourceAspect, 444)] { let plan = - Plan::prepare(&s, &l, 0, &[(1, "1".into())], Target::Preview, strategy).unwrap(); + Plan::prepare(&s, &l, 0, &[(2, "1".into())], Target::Preview, strategy).unwrap(); assert_eq!(plan.bank, "UP"); assert!( plan.changes @@ -357,7 +357,7 @@ mod tests { &s, &l, 0, - &[(1, "1".into())], + &[(2, "1".into())], Target::Program, Sizing::OutputBox, ) @@ -410,7 +410,7 @@ mod tests { &state, &layout(), 0, - &[(1, "1".into())], + &[(2, "1".into())], Target::Preview, Sizing::OutputBox, ) @@ -447,7 +447,7 @@ mod tests { &state, &l, 0, - &[(1, "1".into())], + &[(2, "1".into())], Target::Preview, Sizing::OutputBox, ) @@ -472,7 +472,7 @@ mod tests { &state, &l, 0, - &[(1, "1".into())], + &[(2, "1".into())], Target::Preview, Sizing::OutputBox ) @@ -492,7 +492,7 @@ mod tests { &state, &l, 0, - &[(1, "1".into())], + &[(2, "1".into())], Target::Preview, Sizing::OutputBox ) @@ -506,7 +506,7 @@ mod tests { let state = snapshot(); let l = layout(); let plan = - Plan::prepare(&state, &l, 0, &[(1, "1".into())], Target::Preview, sizing).unwrap(); + Plan::prepare(&state, &l, 0, &[(2, "1".into())], Target::Preview, sizing).unwrap(); let mut mock = Mock { state, writes: 0, @@ -528,7 +528,7 @@ mod tests { let before = restored.layers().clone(); let formats = restored.formats().clone(); restored - .import_device_layers(&[(Some(1), layer.geometry, layer.framing)]) + .import_device_layers(&[(Some(2), layer.geometry, layer.framing)]) .unwrap(); let framing = restored .formats() @@ -549,7 +549,7 @@ mod tests { &state, &layout(), 0, - &[(1, "1".into())], + &[(2, "1".into())], Target::Preview, Sizing::OutputBox, ) @@ -592,7 +592,7 @@ mod tests { &state, &layout(), 0, - &[(1, "1".into())], + &[(2, "1".into())], Target::Preview, Sizing::OutputBox, ) diff --git a/crates/midra-layout/src/gui.rs b/crates/midra-layout/src/gui.rs index 341b681..d8f4964 100644 --- a/crates/midra-layout/src/gui.rs +++ b/crates/midra-layout/src/gui.rs @@ -6244,7 +6244,7 @@ mod tests { let ctx = egui::Context::default(); frame(&mut app, &ctx, vec![]); let p = ctx - .read_response(egui::Id::new(("layer", 1_usize))) + .read_response(egui::Id::new(("layer", 2_usize))) .unwrap() .rect .center(); @@ -6380,7 +6380,7 @@ mod tests { let ctx = egui::Context::default(); frame(&mut app, &ctx, vec![]); let pos = ctx - .read_response(egui::Id::new(("layer", 2_usize))) + .read_response(egui::Id::new(("layer", 1_usize))) .unwrap() .rect .center(); @@ -6430,7 +6430,7 @@ mod tests { assert!(!app.layout.locked(1)); assert!(app.layout.visible(1)); let row = ctx - .read_response(egui::Id::new(("layer", 2_usize))) + .read_response(egui::Id::new(("layer", 1_usize))) .unwrap() .rect; click_shift(&mut app, &ctx, row.center()); @@ -6533,11 +6533,11 @@ mod tests { let rects = layer_rects(&output); assert!(rects[1].left() > rects[0].left()); let top_row = ctx - .read_response(egui::Id::new(("layer", 2_usize))) + .read_response(egui::Id::new(("layer", 1_usize))) .unwrap() .rect; let bottom_row = ctx - .read_response(egui::Id::new(("layer", 1_usize))) + .read_response(egui::Id::new(("layer", 2_usize))) .unwrap() .rect; assert!(top_row.top() < bottom_row.top()); @@ -6568,14 +6568,14 @@ mod tests { click_shift(&mut app, &ctx, rects[1].center()); assert_eq!(app.layout.selected(), Some(0)); let second = ctx - .read_response(egui::Id::new(("layer", 2_usize))) + .read_response(egui::Id::new(("layer", 1_usize))) .unwrap() .rect .center(); click_shift(&mut app, &ctx, second); assert_eq!(app.layout.selected_indices(), vec![0, 1]); let row = ctx - .read_response(egui::Id::new(("layer", 1_usize))) + .read_response(egui::Id::new(("layer", 2_usize))) .unwrap() .rect; click_shift(&mut app, &ctx, row.center()); diff --git a/crates/midra-layout/src/layers_ui.rs b/crates/midra-layout/src/layers_ui.rs index 6e3bdbf..c79298b 100644 --- a/crates/midra-layout/src/layers_ui.rs +++ b/crates/midra-layout/src/layers_ui.rs @@ -279,7 +279,7 @@ mod tests { .rect .center(); let end = ctx - .read_response(egui::Id::new(("layer", 1_usize))) + .read_response(egui::Id::new(("layer", 2_usize))) .unwrap() .rect .center_bottom() @@ -300,7 +300,7 @@ mod tests { (0..3) .map(|i| app.layout.layer_info(i).id) .collect::>(), - [3, 1, 2] + [3, 2, 1] ); app.layout.undo(); assert_eq!( @@ -320,8 +320,8 @@ mod tests { app.manage_layers(); app.layer_ui.drafts[0].1 = "Camera".into(); click_text(&mut app, &ctx, "↓"); - assert_eq!(app.layout.layer_info(1).id, 1); - assert_eq!(app.layout.layer_info(1).name, "Presenter"); + assert_eq!(app.layout.layer_info(1).id, 2); + assert_eq!(app.layout.layer_info(1).name, "Slides"); assert_eq!(app.layer_ui.drafts[1].1, "Camera"); assert_eq!(app.align_target, AlignTarget::Layer(1)); assert!(app.names_pending()); @@ -331,8 +331,8 @@ mod tests { app.layout.undo(); app.layout.undo(); app.sync(); - assert_eq!(app.layout.layer_info(0).id, 1); - assert_eq!(app.layer_ui.drafts[0].0, 1); + assert_eq!(app.layout.layer_info(0).id, 2); + assert_eq!(app.layer_ui.drafts[0].0, 2); assert_eq!(app.align_target, AlignTarget::Layer(0)); } @@ -351,9 +351,9 @@ mod tests { .unwrap() .rect }; - let start = row(1_usize).center(); - assert!(row(3_usize).top() < row(2_usize).top()); - assert!(row(2_usize).top() < row(1_usize).top()); + let start = row(2_usize).center(); + assert!(row(3_usize).top() < row(1_usize).top()); + assert!(row(1_usize).top() < row(2_usize).top()); let end = row(3_usize).center_top() + Vec2::new(0.0, 3.0); frame( &mut app, @@ -375,9 +375,9 @@ mod tests { (0..3) .map(|i| app.layout.layer_info(i).id) .collect::>(), - [2, 3, 1] + [1, 3, 2] ); - assert_eq!(app.layout.layer_info(app.layout.selected().unwrap()).id, 2); + assert_eq!(app.layout.layer_info(app.layout.selected().unwrap()).id, 1); app.layout.undo(); app.sync(); assert_eq!( @@ -435,13 +435,13 @@ mod tests { assert_eq!(app.layout.layer_info(1).name, "Camera"); assert_eq!(app.layout.layer_info(1).id, id); app.layout.undo(); - assert_eq!(app.layout.layer_info(1).name, "Slides"); + assert_eq!(app.layout.layer_info(1).name, "Presenter"); app.manage_layers(); app.layer_ui.drafts[1].1 = "Discarded".into(); app.layer_ui.closing = true; super::super::tests::click_text(&mut app, &ctx, "Discard"); assert!(!app.layer_ui.open); - assert_eq!(app.layout.layer_info(1).name, "Slides"); + assert_eq!(app.layout.layer_info(1).name, "Presenter"); } #[test] diff --git a/crates/midra-layout/src/lib.rs b/crates/midra-layout/src/lib.rs index 3b306d1..b68a946 100644 --- a/crates/midra-layout/src/lib.rs +++ b/crates/midra-layout/src/lib.rs @@ -540,15 +540,15 @@ impl Default for Layout { LayerInfo { pivot: [0.5; 2], midra_link: None, - id: 1, - name: "Presenter".into(), + id: 2, + name: "Slides".into(), folder: String::new(), }, LayerInfo { pivot: [0.5; 2], midra_link: None, - id: 2, - name: "Slides".into(), + id: 1, + name: "Presenter".into(), folder: String::new(), }, ], diff --git a/crates/midra-layout/tests/layers.rs b/crates/midra-layout/tests/layers.rs index e352577..e3396cf 100644 --- a/crates/midra-layout/tests/layers.rs +++ b/crates/midra-layout/tests/layers.rs @@ -65,21 +65,21 @@ fn identities_selection_and_selected_svg_survive_deletion() { layout.remove_selected().unwrap(); layout.select(Some(1)); let project = Project::from_layout(&layout); - assert_eq!(project.layers[0].id, 2); + assert_eq!(project.layers[0].id, 1); assert_eq!(project.layers[1].id, 3); assert_eq!(project.editor.selected_layer_ids, vec![3]); let loaded = project.layout().unwrap(); assert_eq!(loaded.selected(), Some(1)); let svg = project.to_svg_ids(&[3]).unwrap(); assert!(svg.contains("layer-3")); - assert!(!svg.contains("layer-2")); - assert!(project.to_svg_ids(&[1]).is_err()); + assert!(!svg.contains("layer-1")); + assert!(project.to_svg_ids(&[2]).is_err()); assert!(project.to_svg_ids(&[3, 3]).is_err()); let mut invalid = project.clone(); invalid.next_layer_id = 3; assert!(invalid.layout().is_err()); let mut invalid = project.clone(); - invalid.layers[1].id = 2; + invalid.layers[1].id = 1; assert!(invalid.layout().is_err()); } #[test] @@ -88,7 +88,7 @@ fn whole_list_rename_is_atomic_and_empty_document_is_refused() { let before = Project::from_layout(&layout); assert!( layout - .rename_layers(&[(1, "Valid".into(), "".into()), (2, "".into(), "".into())]) + .rename_layers(&[(2, "Valid".into(), "".into()), (1, "".into(), "".into())]) .is_err() ); assert_eq!(Project::from_layout(&layout), before); @@ -96,24 +96,26 @@ fn whole_list_rename_is_atomic_and_empty_document_is_refused() { assert!(layout.remove_selected().is_err()); layout .rename_layers(&[ - (1, "Left".into(), "Pair".into()), - (2, "Right".into(), "Pair".into()), + (2, "Left".into(), "Pair".into()), + (1, "Right".into(), "Pair".into()), ]) .unwrap(); layout.undo(); - assert_eq!(layout.layer_info(0).name, "Presenter"); - assert_eq!(layout.layer_info(1).name, "Slides"); + assert_eq!(layout.layer_info(0).name, "Slides"); + assert_eq!(layout.layer_info(1).name, "Presenter"); } #[test] -fn documented_v3_example_matches_default() { - assert_eq!( - Project::from_json(include_str!( - "../../../docs/interfaces/midra-layout-v3.example.json" - )) - .unwrap(), - Project::from_layout(&Layout::default()) - ); +fn documented_v3_example_keeps_original_labels() { + let project = Project::from_json(include_str!( + "../../../docs/interfaces/midra-layout-v3.example.json" + )) + .unwrap(); + assert_eq!(project.layers[0].id, 1); + assert_eq!(project.layers[0].name, "Presenter"); + assert_eq!(project.layers[1].id, 2); + assert_eq!(project.layers[1].name, "Slides"); } + #[test] fn visibility_and_lock_changes_are_local_undoable_edits() { let mut layout = Layout::default(); @@ -163,11 +165,11 @@ fn reorder_preserves_complete_layer_identity_history_and_file_order() { layout.set_visible(0, false); layout.set_selection([false, true, true]); let before = Project::from_layout(&layout); - layout.move_layer(1, 2).unwrap(); + layout.move_layer(2, 2).unwrap(); let after = Project::from_layout(&layout); assert_eq!( after.layers.iter().map(|l| l.id).collect::>(), - [2, 3, 1] + [1, 3, 2] ); for layer in &before.layers { assert_eq!( @@ -177,35 +179,35 @@ fn reorder_preserves_complete_layer_identity_history_and_file_order() { } assert_eq!(after.inputs, before.inputs); assert_eq!(after.next_layer_id, before.next_layer_id); - assert_eq!(after.editor.selected_layer_ids, [2, 3]); + assert_eq!(after.editor.selected_layer_ids, [1, 3]); let loaded = Project::from_json(&after.to_json().unwrap()) .unwrap() .layout() .unwrap(); assert_eq!(Project::from_layout(&loaded), after); let svg = after.to_svg(false).unwrap(); - assert!(svg.find("layer-2").unwrap() < svg.find("layer-3").unwrap()); - assert!(svg.find("layer-3").unwrap() < svg.find("layer-1").unwrap()); + assert!(svg.find("layer-1").unwrap() < svg.find("layer-3").unwrap()); + assert!(svg.find("layer-3").unwrap() < svg.find("layer-2").unwrap()); layout.undo(); assert_eq!(Project::from_layout(&layout), before); layout.redo(); assert_eq!(Project::from_layout(&layout), after); - layout.move_layer(1, 0).unwrap(); + layout.move_layer(2, 0).unwrap(); assert_eq!(Project::from_layout(&layout), before); } #[test] fn invalid_and_noop_reorders_leave_history_and_ids_unchanged() { let mut layout = Layout::default(); - layout.move_layer(1, 1).unwrap(); + layout.move_layer(2, 1).unwrap(); let before = Project::from_layout(&layout); assert!(layout.move_layer(999, 0).is_err()); - assert!(layout.move_layer(1, 2).is_err()); - layout.move_layer(1, 1).unwrap(); + assert!(layout.move_layer(2, 2).is_err()); + layout.move_layer(2, 1).unwrap(); assert_eq!(Project::from_layout(&layout), before); layout.undo(); - assert_eq!(layout.layer_info(0).id, 1); - assert_eq!(layout.layer_info(1).id, 2); + assert_eq!(layout.layer_info(0).id, 2); + assert_eq!(layout.layer_info(1).id, 1); } #[test] @@ -213,10 +215,10 @@ fn reordered_stacking_and_hit_testing_follow_document_order() { let mut layout = Layout::default(); layout.apply(1, layout.layers()[0]).unwrap(); layout.select(None); - assert_eq!(layout.layer_info(layout.hit([200.0, 200.0]).unwrap()).id, 2); - layout.move_layer(1, 1).unwrap(); assert_eq!(layout.layer_info(layout.hit([200.0, 200.0]).unwrap()).id, 1); + layout.move_layer(2, 1).unwrap(); + assert_eq!(layout.layer_info(layout.hit([200.0, 200.0]).unwrap()).id, 2); layout.select(Some(0)); // Selecting the lower layer does not raise it above the saved top layer. - assert_eq!(layout.layer_info(layout.hit([200.0, 200.0]).unwrap()).id, 1); + assert_eq!(layout.layer_info(layout.hit([200.0, 200.0]).unwrap()).id, 2); } diff --git a/crates/midra-layout/tests/project.rs b/crates/midra-layout/tests/project.rs index 430f613..9fdb73d 100644 --- a/crates/midra-layout/tests/project.rs +++ b/crates/midra-layout/tests/project.rs @@ -4,6 +4,17 @@ use midra_layout::{ project::{Project, write_file}, }; +// Old files retain their original labels/IDs rather than adopting new-project defaults. +fn legacy_default() -> Project { + let mut p = Project::from_layout(&Layout::default()); + p.layers[0].id = 1; + p.layers[0].name = "Presenter".into(); + p.layers[1].id = 2; + p.layers[1].name = "Slides".into(); + p.editor.selected_layer_ids = vec![2]; + p +} + #[test] fn full_precision_project_roundtrip_restores_sources_crops_flags_and_selection() { let mut layout = Layout::default(); @@ -146,10 +157,7 @@ fn publication_requires_overwrite_and_read_matches_written_document() { #[test] fn documented_example_is_a_valid_version_one_project() { let example = include_str!("../../../docs/interfaces/midra-layout-v1.example.json"); - assert_eq!( - Project::from_json(example).unwrap(), - Project::from_layout(&Layout::default()) - ); + assert_eq!(Project::from_json(example).unwrap(), legacy_default()); } #[test] @@ -167,10 +175,7 @@ fn version_two_requires_captions_preference_and_preserves_it() { .remove("show_toolbar_icon_names"); assert!(Project::from_json(&missing.to_string()).is_err()); let example = include_str!("../../../docs/interfaces/midra-layout-v2.example.json"); - assert_eq!( - Project::from_json(example).unwrap(), - Project::from_layout(&Layout::default()) - ); + assert_eq!(Project::from_json(example).unwrap(), legacy_default()); } #[test] fn v4_example_and_old_version_migrations_preserve_defaults() { @@ -179,7 +184,7 @@ fn v4_example_and_old_version_migrations_preserve_defaults() { "../../../docs/interfaces/midra-layout-v4.example.json" )) .unwrap(), - Project::from_layout(&Layout::default()) + legacy_default() ); let mut value = serde_json::to_value(Project::from_layout(&Layout::default())).unwrap(); value["version"] = 0.into(); @@ -289,7 +294,7 @@ fn position_point_schema_migrates_corners_and_rejects_mislabeled_files() { "../../../docs/interfaces/midra-layout-v6.example.json" )) .unwrap(); - assert_eq!(current, Project::from_layout(&Layout::default())); + assert_eq!(current, legacy_default()); for (name, expected) in [ ("top_left", PositionPoint::TopLeft), ("top_right", PositionPoint::TopRight), @@ -337,7 +342,7 @@ fn backdrop_title_roundtrips_and_older_projects_gain_the_default() { "../../../docs/interfaces/midra-layout-v7.example.json" )) .unwrap(); - assert_eq!(current, Project::from_layout(&Layout::default())); + assert_eq!(current, legacy_default()); for text in ["", "Conférence · Main stage", &"é".repeat(128)] { let mut project = current.clone(); project.editor.backdrop_title = text.into(); @@ -378,7 +383,7 @@ fn independent_layer_point_is_explicit_and_old_projects_keep_matched_points() { "../../../docs/interfaces/midra-layout-v8.example.json" )) .unwrap(); - assert_eq!(current, Project::from_layout(&Layout::default())); + assert_eq!(current, legacy_default()); for point in [ None, Some(PositionPoint::Center), diff --git a/docs/interfaces/midra-layout-recovery-v1.example.json b/docs/interfaces/midra-layout-recovery-v1.example.json index 3a8c79d..1e63890 100644 --- a/docs/interfaces/midra-layout-recovery-v1.example.json +++ b/docs/interfaces/midra-layout-recovery-v1.example.json @@ -39,7 +39,7 @@ ], "layers": [ { - "id": 1, + "id": 2, "source_id": 1, "bounds": { "x": 120.0, @@ -55,31 +55,6 @@ }, "visible": true, "locked": false, - "name": "Presenter", - "folder": "", - "midra_link": null, - "pivot": [ - 0.5, - 0.5 - ] - }, - { - "id": 2, - "source_id": 2, - "bounds": { - "x": 1160.0, - "y": 180.0, - "width": 640.0, - "height": 360.0 - }, - "advanced_crop": { - "left": 0.0, - "right": 0.0, - "top": 0.0, - "bottom": 0.0 - }, - "visible": true, - "locked": false, "name": "Slides", "folder": "", "midra_link": null, @@ -87,13 +62,38 @@ 0.5, 0.5 ] + }, + { + "id": 1, + "source_id": 2, + "bounds": { + "x": 1160.0, + "y": 180.0, + "width": 640.0, + "height": 360.0 + }, + "advanced_crop": { + "left": 0.0, + "right": 0.0, + "top": 0.0, + "bottom": 0.0 + }, + "visible": true, + "locked": false, + "name": "Presenter", + "folder": "", + "midra_link": null, + "pivot": [ + 0.5, + 0.5 + ] } ], "reference": null, "editor": { "backdrop_title": "Example Conference Name", "selected_layer_ids": [ - 2 + 1 ], "position_point": "top_left", "keep_aspect_ratio": true, diff --git a/docs/interfaces/midra-layout-v9.example.json b/docs/interfaces/midra-layout-v9.example.json index a9c3a85..6e97cd3 100644 --- a/docs/interfaces/midra-layout-v9.example.json +++ b/docs/interfaces/midra-layout-v9.example.json @@ -37,7 +37,7 @@ ], "layers": [ { - "id": 1, + "id": 2, "source_id": 1, "bounds": { "x": 120.0, @@ -53,31 +53,6 @@ }, "visible": true, "locked": false, - "name": "Presenter", - "folder": "", - "midra_link": null, - "pivot": [ - 0.5, - 0.5 - ] - }, - { - "id": 2, - "source_id": 2, - "bounds": { - "x": 1160.0, - "y": 180.0, - "width": 640.0, - "height": 360.0 - }, - "advanced_crop": { - "left": 0.0, - "right": 0.0, - "top": 0.0, - "bottom": 0.0 - }, - "visible": true, - "locked": false, "name": "Slides", "folder": "", "midra_link": null, @@ -85,13 +60,38 @@ 0.5, 0.5 ] + }, + { + "id": 1, + "source_id": 2, + "bounds": { + "x": 1160.0, + "y": 180.0, + "width": 640.0, + "height": 360.0 + }, + "advanced_crop": { + "left": 0.0, + "right": 0.0, + "top": 0.0, + "bottom": 0.0 + }, + "visible": true, + "locked": false, + "name": "Presenter", + "folder": "", + "midra_link": null, + "pivot": [ + 0.5, + 0.5 + ] } ], "reference": null, "editor": { "backdrop_title": "Example Conference Name", "selected_layer_ids": [ - 2 + 1 ], "position_point": "top_left", "keep_aspect_ratio": true, diff --git a/docs/interfaces/midra-layout.md b/docs/interfaces/midra-layout.md index 7dc2cdf..035b5fc 100644 --- a/docs/interfaces/midra-layout.md +++ b/docs/interfaces/midra-layout.md @@ -22,7 +22,9 @@ Version 5 adds required `midra_link` to every layer. Versions 1–4 migrate with Incompatible files are never partially applied. [Complete example](midra-layout-v9.example.json) is a valid default project, -without a reference image. It is loaded by the regression tests. +without a reference image. New projects label the lower layer `02 / Slides` and +the upper layer `01 / Presenter`; existing projects retain their saved IDs/names. +It is loaded by the regression tests. | Root field | Representation / meaning | | --- | --- | diff --git a/docs/midralayout/changelog.md b/docs/midralayout/changelog.md index 3504b01..edac6cf 100644 --- a/docs/midralayout/changelog.md +++ b/docs/midralayout/changelog.md @@ -4,6 +4,8 @@ ## Unreleased +- Swap new-project default labels: top layer is 01 / Presenter, lower layer is 02 / Slides. Geometry, draw order and existing projects are unchanged. + - Recover the last session automatically from a separate two-second autosave; named saves stay explicit. New project offers Save/Discard/Cancel and shows the last manual-save age. Failed/corrupt recovery is reported and preserved. - Measurement-point choices and the independent-point toggle autosave to the current project file; other unsaved edits remain untouched. New projects need a first Save.