From 5af51906dcac12a298d5e3a2f2711cfc40205d7c Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Tue, 17 Nov 2026 11:00:58 -0800 Subject: [PATCH] Messages: a press on a message closes it when an older message goes first The click took the frame's automatic id, which follows its position among the messages, so a message pressed while an older one expired did not close on release. The click now takes an id from the message's own scope. --- crates/ui-egui/src/toasts.rs | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/crates/ui-egui/src/toasts.rs b/crates/ui-egui/src/toasts.rs index 0d47c4e3b4..a8bdb46be5 100644 --- a/crates/ui-egui/src/toasts.rs +++ b/crates/ui-egui/src/toasts.rs @@ -138,7 +138,9 @@ fn message(ui: &mut egui::Ui, e: &Entry, t: &Tokens) -> egui::Response { ui.add(egui::Label::new(galley).selectable(false)); elided }); - let r = frame.response.interact(egui::Sense::click()).on_hover_cursor(egui::CursorIcon::PointingHand); + // The click takes its id from the message's own scope, not from the frame's position among + // the messages, so a press survives an older message going. + let r = ui.interact(frame.response.rect, ui.scope_id().with("toast"), egui::Sense::click()).on_hover_cursor(egui::CursorIcon::PointingHand); // A message cut short shows in full on hover. if frame.inner { r.on_hover_text(&e.toast.message) } else { r } } @@ -257,6 +259,26 @@ mod tests { assert_eq!(messages(&app), vec!["top", "bottom"]); } + #[test] + fn a_message_pressed_while_an_older_one_goes_still_closes_on_release() { + let (mut app, ctx) = app(); + for (message, seconds) in [("older", 0.5), ("pressed", 60.0), ("bottom", 60.0)] { + app.session.toast(Toast { seconds, ..Toast::new(message, Level::Info) }); + } + pass(&mut app, &ctx, 0.0, vec![]); + pass(&mut app, &ctx, 0.0, vec![]); + let at = app.toasts.list[1].rect.unwrap().center(); + let press = |pressed| egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() }; + pass(&mut app, &ctx, 0.1, vec![egui::Event::PointerMoved(at)]); + pass(&mut app, &ctx, 0.2, vec![press(true)]); + // "older" goes while the button is down; the newer messages stay where they were. + pass(&mut app, &ctx, 0.6, vec![]); + assert_eq!(messages(&app), vec!["pressed", "bottom"]); + pass(&mut app, &ctx, 0.7, vec![]); + pass(&mut app, &ctx, 0.8, vec![press(false)]); + assert_eq!(messages(&app), vec!["bottom"]); + } + #[test] fn an_action_records_a_message_and_shows_it_again_when_played() { use crate::panels::actions::{START_RECORDING, STOP_RECORDING, play};