LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust
Merge lightcraft#2913 (egui 0.37) into docking-adoption; craft-ui and craft-docpath at craft-libs main a091680
aiongg672baaea461f
diff --cc Cargo.lockindex c6bb9c9d3,4c745676a..dfe6425e1--- a/Cargo.lock+++ b/Cargo.lock@@@ -1084,18 -1080,14 +1080,18 @@@ dependencies =[[package]]name = "craft-docpath"version = "0.1.0"- source = "git+https://github.com/storytold/craft-libs?rev=5bbe9f6254de3bb9f9707ae0740ab0db8170afd5#5bbe9f6254de3bb9f9707ae0740ab0db8170afd5"-source = "git+https://github.com/storytold/craft-libs?rev=82a24b006eefa036b43c09a67fb9a3fbd17ffe63#82a24b006eefa036b43c09a67fb9a3fbd17ffe63"++source = "git+https://github.com/storytold/craft-libs?rev=a0916808f7d78bed8c7b90cdf937176015454a7f#a0916808f7d78bed8c7b90cdf937176015454a7f"[[package]]name = "craft-ui"version = "0.1.0"- source = "git+https://github.com/storytold/craft-libs?rev=5bbe9f6254de3bb9f9707ae0740ab0db8170afd5#5bbe9f6254de3bb9f9707ae0740ab0db8170afd5"-source = "git+https://github.com/storytold/craft-libs?rev=25da1314d443171b4adeaad2cd9454b273f35c6f#25da1314d443171b4adeaad2cd9454b273f35c6f"++source = "git+https://github.com/storytold/craft-libs?rev=a0916808f7d78bed8c7b90cdf937176015454a7f#a0916808f7d78bed8c7b90cdf937176015454a7f"dependencies = ["egui",+ "log",+ "objc2 0.6.4",+ "objc2-app-kit 0.3.2",+ "objc2-foundation 0.3.2","serde",]diff --cc Cargo.tomlindex 72d732c6f,76a6ad78d..296ae8709--- a/Cargo.toml+++ b/Cargo.toml@@@ -10,8 -10,8 +10,8 @@@ rust-version = "1.95repository = "https://github.com/storytold/lightcraft"[workspace.dependencies]- craft-ui = { git = "https://github.com/storytold/craft-libs", rev = "5bbe9f6254de3bb9f9707ae0740ab0db8170afd5", features = ["serde"] }- craft-docpath = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5bbe9f6254de3bb9f9707ae0740ab0db8170afd5" }-craft-ui = { git = "https://github.com/storytold/craft-libs", rev = "25da1314d443171b4adeaad2cd9454b273f35c6f", features = ["serde"] }-craft-docpath = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "82a24b006eefa036b43c09a67fb9a3fbd17ffe63" }++craft-ui = { git = "https://github.com/storytold/craft-libs", rev = "a0916808f7d78bed8c7b90cdf937176015454a7f", features = ["serde"] }++craft-docpath = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "a0916808f7d78bed8c7b90cdf937176015454a7f" }# internallightcraft-denoise-core = { path = "crates/denoise-core" }lightcraft-denoise = { path = "crates/denoise", default-features = false }diff --cc crates/ui-egui/src/docking.rsindex 59c00b0f6,a8ef56f39..f2bc190d7--- a/crates/ui-egui/src/docking.rs+++ b/crates/ui-egui/src/docking.rs@@@ -342,8 -404,8 +346,8 @@@ fn command_impl(app: &mut crate::Lightcpub fn show(app: &mut crate::LightcraftApp, ui: &mut egui::Ui) {let t = crate::theme::Tokens::get(ui.ctx());let mut workspace = app.ui.docking.clone().unwrap_or_else(|| from_ui(app));- if let Err(error) = workspace.validate().and_then(|()| sync(&mut workspace, app)) {+ if let Err(error) = validate(&workspace).and_then(|()| sync(&mut workspace, app)) {- app.ui.toast = Some((format!("Panel layout could not be restored: {error}"), ui.input(|input| input.time) + 8.0, None));+ app.ui.toast = Some((format!("Panel layout could not be restored: {error}"), app.tick_now() + 8.0, None));workspace = from_ui(app);let _ = sync(&mut workspace, app);}@@@ -389,7 -431,7 +393,7 @@@style.font = t.font(12.0);// Tool and preset panels publish hover previews before the photo consumes them.let mut canvas = None;- let output = DockArea::new(egui::Id::new("lightcraft-docking")).locked(workspace.locked).show_with_limits(- let output = DockArea::new(egui::Id::unique("lightcraft-docking")).show_with_limits(++ let output = DockArea::new(egui::Id::unique("lightcraft-docking")).locked(workspace.locked).show_with_limits(ui,&workspace.layout,&style,diff --cc crates/ui-egui/src/tests_docking_acceptance.rsindex 940451f19,75397d1cc..207ad5fae--- a/crates/ui-egui/src/tests_docking_acceptance.rs+++ b/crates/ui-egui/src/tests_docking_acceptance.rs@@@ -295,8 -271,8 +295,8 @@@ fn covered_keyword_rejects_hierarchy_mo#[test]fn reset_during_held_divider_drag_keeps_replacement_layout_on_later_movement() {let mut h = app();- let divider = egui::Id::new("lightcraft-docking").with(("column-resize", Some(Panel::Library)));- let divider = egui::Id::unique("lightcraft-docking").with(("split", Vec::<bool>::new()));- let from = h.view.ctx.read_response(divider).expect("the custom workspace root divider is rendered").rect.center();++ let divider = egui::Id::unique("lightcraft-docking").with(("column-resize", Some(Panel::Library)));+ let from = h.view.ctx.read_response(divider).expect("the Library column's divider is rendered").rect.center();let before = h.app.ui.docking.as_ref().unwrap().layout.clone();h.app.synthetic.push(Event::PointerButton { pos: from, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE });h.step();@@@ -327,7 -303,7 +327,7 @@@fn held_divider_replacement_route(route: &str) {let mut h = app();- let divider = egui::Id::new("lightcraft-docking").with(("column-resize", Some(Panel::Library)));- let divider = egui::Id::unique("lightcraft-docking").with(("split", Vec::<bool>::new()));++ let divider = egui::Id::unique("lightcraft-docking").with(("column-resize", Some(Panel::Library)));let from = h.view.ctx.read_response(divider).unwrap().rect.center();let photos = serde_json::to_value(h.app.session.catalog.photos().map(|photo| photo.as_ref()).collect::<Vec<_>>()).unwrap();h.app.synthetic.push(Event::PointerButton { pos: from, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE });diff --cc crates/ui-egui/tests/it/docking_workflows.rsindex 1d360a6b2,aa80e8301..e13b0ff0e--- a/crates/ui-egui/tests/it/docking_workflows.rs+++ b/crates/ui-egui/tests/it/docking_workflows.rs@@@ -87,61 -86,6 +87,61 @@@ fn real_drag_float_close_reopen_and_staassert_eq!(reloaded.state().ui.right, RightPanel::Crop);}+#[test]+fn dragging_a_group_by_its_bar_moves_the_whole_group() {+ let mut h = harness(None, 1400.0, 1.0);+ h.state_mut().ui.presets = true;+ h.run_steps(4);+ h.state_mut().run("ui.dock", json!({"operation":"move","panel":"presets","target":"tools","zone":"center"})).unwrap();+ h.run_steps(6);- let bar = DockArea::<Panel>::hit_rects(&h.ctx, egui::Id::new("lightcraft-docking"))++ let bar = DockArea::<Panel>::hit_rects(&h.ctx, egui::Id::unique("lightcraft-docking"))+ .into_iter()+ .find_map(|(hit, rect)| matches!(hit, Hit::DragBar(Panel::Tools | Panel::Presets)).then_some(rect))+ .expect("the Tools and Presets group draws its drag bar");+ let target = h.get_by_role_and_label(egui::accesskit::Role::Tab, "Library").rect().center();+ drag(&mut h, bar.center(), target);+ let mut library = start_dock(&h).into_iter().flatten().find(|panels| panels.contains(&Panel::Library)).unwrap();+ library.sort_by_key(|panel| panel.id());+ assert_eq!(library, [Panel::Library, Panel::Presets, Panel::Tools], "both panels of the dragged group joined Library");+ assert_eq!(h.state().ui.right, RightPanel::Edit);+}++/// The start dock's columns from the window edge inwards, each as its groups' panels.+fn start_dock(h: &Harness<'_, LightcraftApp>) -> Vec<Vec<Vec<Panel>>> {+ let layout = &h.state().ui.docking.as_ref().unwrap().layout;+ let mut nodes: Vec<_> = layout.root.iter().collect();+ while let Some(node) = nodes.pop() {+ match node {+ Node::Split { first, second, .. } => nodes.extend([&**first, &**second]),+ Node::Dock { side: Side::Start, columns } => {+ return columns.iter().map(|column| column.groups.iter().map(|group| group.panels.clone()).collect()).collect();+ }+ _ => {}+ }+ }+ Vec::new()+}++/// In a dock column, a group's top third stacks above it, its photo-side third adds a column+/// there and its middle joins its tabs.+#[test]+fn a_tab_dropped_on_a_dock_group_stacks_adds_a_column_or_joins_by_where_it_lands() {+ let cases: [(fn(egui::Rect) -> egui::Pos2, Vec<Vec<Vec<Panel>>>); 3] = [+ (|r| egui::pos2(r.center().x, r.top() + r.height() / 6.0), vec![vec![vec![Panel::Tools], vec![Panel::Library]]]),+ (|r| egui::pos2(r.right() - r.width() / 6.0, r.center().y), vec![vec![vec![Panel::Library]], vec![vec![Panel::Tools]]]),+ (|r| r.center(), vec![vec![vec![Panel::Library, Panel::Tools]]]),+ ];+ for (at, expected) in cases {+ let mut h = harness(None, 1400.0, 1.0);+ let library = h.state().widgets.iter().find(|(id, _)| id == "panel:left_panel").unwrap().1;+ let source = h.get_by_role_and_label(egui::accesskit::Role::Tab, "Tools").rect().center();+ drag(&mut h, source, at(library));+ assert_eq!(start_dock(&h), expected, "dropped at {:?} of {library:?}", at(library));+ lightcraft_ui_egui::docking::validate(h.state().ui.docking.as_ref().unwrap()).unwrap();+ assert_eq!(h.state().ui.right, RightPanel::Edit);+ }+}+#[test]fn invalid_docking_requests_preserve_layout_and_selected_tool() {let mut h = harness(None, 1400.0, 1.0);