diff --git a/Cargo.lock b/Cargo.lock index eb7c808..ce70ac8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -602,7 +602,7 @@ dependencies = [ [[package]] name = "canvas-pilot" -version = "0.10.5" +version = "0.10.6" dependencies = [ "base64 0.22.1", "craft-dwg", diff --git a/Cargo.toml b/Cargo.toml index c017d82..3d8a29e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ default-members = ["crates/canvas-pilot"] resolver = "3" [workspace.package] -version = "0.10.5" +version = "0.10.6" edition = "2024" license = "MIT" repository = "https://proxy.dandaedre.com/gitea/idle-org/canvas-pilot" diff --git a/crates/canvas-pilot/src/gui.rs b/crates/canvas-pilot/src/gui.rs index c8b3b0d..d946821 100644 --- a/crates/canvas-pilot/src/gui.rs +++ b/crates/canvas-pilot/src/gui.rs @@ -2163,10 +2163,12 @@ impl Editor { } _ => default_name.to_owned(), }; - egui::ComboBox::from_id_salt("alignment-target") - .width(210.0) - .selected_text(target_name(self.align_target)) - .show_ui(ui, |ui| { + egui::containers::menu::SubMenuButton::new(target_name(self.align_target)) + .config( + egui::containers::menu::MenuConfig::new() + .close_behavior(egui::PopupCloseBehavior::CloseOnClickOutside), + ) + .ui(ui, |ui| { ui.stable_selectable_value( &mut self.align_target, AlignTarget::Selection, @@ -9670,6 +9672,24 @@ mod tests { frame(app, ctx, vec![mouse(pos, false)]); frame(app, ctx, vec![]) } + fn open_context_alignment_test_menu(app: &mut Editor, ctx: &egui::Context) -> egui::FullOutput { + let output = frame(app, ctx, vec![]); + let pos = layer_rects(&output)[1].center(); + let secondary = |pressed| egui::Event::PointerButton { + pos, + button: egui::PointerButton::Secondary, + pressed, + modifiers: egui::Modifiers::NONE, + }; + frame( + app, + ctx, + vec![egui::Event::PointerMoved(pos), secondary(true)], + ); + frame(app, ctx, vec![secondary(false)]); + click_text(app, ctx, &tr(ctx, "ui.align")); + frame(app, ctx, vec![]) + } fn alignment_test_position(output: &egui::FullOutput, title: &str) -> Pos2 { let rects: Vec<_> = output .shapes @@ -9808,6 +9828,30 @@ mod tests { } } #[test] + fn alignment_target_submenu_selects_a_target_without_closing_alignment() { + for context_menu in [false, true] { + let mut app = Editor::default(); + app.layout.set_selection([true; 2]); + app.align_target = AlignTarget::Layer(0); + let current_target = format!("Layer 1: {}", app.layout.layer_info(0).name); + let ctx = egui::Context::default(); + + if context_menu { + open_context_alignment_test_menu(&mut app, &ctx); + } else { + open_alignment_test_menu(&mut app, &ctx); + } + click_text(&mut app, &ctx, ¤t_target); + click_text(&mut app, &ctx, "Selected layers"); + + assert_eq!(app.align_target, AlignTarget::Selection); + let output = frame(&mut app, &ctx, vec![]); + assert!(output.shapes.iter().any( + |shape| matches!(&shape.shape, egui::Shape::Text(text) if text.galley.text() == "ALIGN TO") + )); + } + } + #[test] fn top_and_bottom_buttons_align_rendered_edges_for_every_target() { for target in [ AlignTarget::Selection, diff --git a/docs/canvas-pilot/changelog.md b/docs/canvas-pilot/changelog.md index 017824a..61016c7 100644 --- a/docs/canvas-pilot/changelog.md +++ b/docs/canvas-pilot/changelog.md @@ -4,6 +4,12 @@ ## Unreleased +### v0.10.6 + +- Keep the alignment menu open while choosing its target, making **Selected + layers** and individual layer targets usable from both the toolbar and canvas + context menu. + ### v0.10.5 - Place **Size presets** before **Output format** and **Viewport options** in the