From 665170d1f8b33af114b2e71ebba0a2bfd164bfda Mon Sep 17 00:00:00 2001 From: Trevor Brown Date: Fri, 6 Nov 2026 09:47:35 -0500 Subject: [PATCH] =?UTF-8?q?Toolbar=20flyout:=20a=20failed=20Edit=20Toolbar?= =?UTF-8?q?=E2=80=A6=20reports=20its=20error=20in=20the=20status=20bar=20(?= =?UTF-8?q?#11378)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The flyout row discarded the result of edit.toolbar, so a rejected command (for example by an automation policy) just closed the flyout silently. It now sets the status bar error like other panels. Co-Authored-By: Claude Fable 5.1 --- crates/ui-egui/src/panels/toolbar.rs | 5 ++++- .../src/toolbar_more_slot_flyout_tests.rs | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/crates/ui-egui/src/panels/toolbar.rs b/crates/ui-egui/src/panels/toolbar.rs index 87ef482461..dc05b75d74 100644 --- a/crates/ui-egui/src/panels/toolbar.rs +++ b/crates/ui-egui/src/panels/toolbar.rs @@ -128,7 +128,10 @@ fn more_slot_flyout(app: &mut PhotocraftApp, ui: &mut egui::Ui, button: &egui::R if area.inner.inner { ui.data_mut(|d| d.remove::(open_id)); let ctx = ui.ctx().clone(); - let _ = crate::menus::invoke(app, &ctx, "edit.toolbar", json!({})); + if let Err(e) = crate::menus::invoke(app, &ctx, "edit.toolbar", json!({})) { + app.ui.status = e; + app.ui.status_error = true; + } return; } let pressed_outside = diff --git a/crates/ui-egui/src/toolbar_more_slot_flyout_tests.rs b/crates/ui-egui/src/toolbar_more_slot_flyout_tests.rs index 99c4dbebb6..f34623ea97 100644 --- a/crates/ui-egui/src/toolbar_more_slot_flyout_tests.rs +++ b/crates/ui-egui/src/toolbar_more_slot_flyout_tests.rs @@ -105,3 +105,21 @@ fn a_left_click_still_opens_edit_toolbar_directly() { assert_eq!(app.ui.dialogs.len(), 1); assert!(!open(&ctx), "no flyout for a left click"); } + +#[test] +fn a_failed_edit_toolbar_from_the_flyout_reports_its_error_in_the_status_bar() { + let (mut app, ctx, at) = setup(); + app.automation_input = true; + app.services.automation_command = Some(Box::new(|id, _| if id == "edit.toolbar" { Err("toolbar edits denied".into()) } else { Ok(()) })); + right_click(&mut app, &ctx, at, 1.0); + let row = flyout(&ctx).unwrap().center(); + frame(&mut app, &ctx, 1.95, vec![Event::PointerMoved(row)]); + frame(&mut app, &ctx, 2.0, vec![button(row, egui::PointerButton::Primary, true)]); + frame(&mut app, &ctx, 2.05, vec![]); + frame(&mut app, &ctx, 2.1, vec![button(row, egui::PointerButton::Primary, false)]); + frame(&mut app, &ctx, 2.15, vec![]); + assert!(app.ui.dialogs.is_empty(), "the denied command opened nothing"); + assert!(!open(&ctx)); + assert_eq!(app.ui.status, "toolbar edits denied"); + assert!(app.ui.status_error); +}