feat(app): undo on toasts for marking a title and leaving Continue watching

A toast can carry a button. Marking a whole title watched or unwatched
from its tile menu, and taking it off Continue watching, both lose
state the viewer may have wanted; each now says what it did with an
Undo that puts every changed watch state back as it was.

crates/pstr-app/src/app.rs

@@ -164,6 +164,19 @@ pub enum Action {
     /// Seek past openings and credits without being asked.
     SetAutoSkip(bool),
     SetDesktopPrefs(crate::desktop_prefs::DesktopPrefs),
+    /// Every episode of a title, watched or not, with an Undo.
+    SetTitleWatched {
+        key: String,
+        watched: bool,
+    },
+    /// Take a title off Continue watching by forgetting where it stopped,
+    /// with an Undo.
+    ForgetPosition {
+        share_id: String,
+        link_id: String,
+    },
+    /// Put watch states back as they were — what Undo does.
+    RestoreWatch(Vec<(String, String, pstr_core::catalog::WatchState)>),
     ClearStreamCache,
     /// Repaint the window in a different palette.
     SetAppearance(Appearance),
@@ -1243,6 +1256,72 @@ impl App {
                 }
             }
             Action::SetDesktopPrefs(prefs) => self.engine.set_desktop_prefs(prefs),
+            Action::SetTitleWatched { key, watched } => {
+                let Some(title) = self.library.get(&key) else {
+                    return;
+                };
+                let name = title.name.clone();
+                let mut before = Vec::new();
+                for episode in title.episodes().filter(|e| e.is_watched() != watched) {
+                    let duration = episode.watch.and_then(|watch| watch.duration_secs);
+                    before.push((
+                        episode.node.share_id.clone(),
+                        episode.node.link_id.clone(),
+                        episode.watch.unwrap_or(watch_state(0.0, duration, false)),
+                    ));
+                    self.engine.save_watch_state(
+                        episode.node.share_id.clone(),
+                        episode.node.link_id.clone(),
+                        watch_state(
+                            if watched {
+                                duration.unwrap_or(0.0)
+                            } else {
+                                0.0
+                            },
+                            duration,
+                            watched,
+                        ),
+                    );
+                }
+                let now = ctx.input(|input| input.time);
+                self.toasts.push_with(
+                    now,
+                    format!(
+                        "marked {name} {}",
+                        if watched { "watched" } else { "unwatched" }
+                    ),
+                    "Undo",
+                    Action::RestoreWatch(before),
+                );
+            }
+            Action::ForgetPosition { share_id, link_id } => {
+                let found = self.library.titles.iter().find_map(|title| {
+                    let episode = title.episodes().find(|episode| {
+                        episode.node.share_id == share_id && episode.node.link_id == link_id
+                    })?;
+                    Some((title.name.clone(), episode.watch))
+                });
+                let Some((name, Some(before))) = found else {
+                    return;
+                };
+                self.engine.save_watch_state(
+                    share_id.clone(),
+                    link_id.clone(),
+                    watch_state(0.0, before.duration_secs, false),
+                );
+                let now = ctx.input(|input| input.time);
+                self.toasts.push_with(
+                    now,
+                    format!("removed {name} from Continue watching"),
+                    "Undo",
+                    Action::RestoreWatch(vec![(share_id, link_id, before)]),
+                );
+            }
+            Action::RestoreWatch(states) => {
+                for (share_id, link_id, state) in states {
+                    self.engine.save_watch_state(share_id, link_id, state);
+                }
+            }
             Action::ClearStreamCache => self.engine.clear_stream_cache(),
             Action::SetAutoSkip(auto_skip) => {
                 let mut prefs = self.engine.playback_prefs();
@@ -1485,7 +1564,9 @@ impl eframe::App for App {
             {
                 self.osd = None;
             }
-            self.toasts.show(ctx, self.overlay.covered());
+            if let Some(action) = self.toasts.show(ctx, self.overlay.covered()) {
+                actions.push(action);
+            }
 
             for action in actions {
                 self.apply(ctx, action);
@@ -1725,7 +1806,9 @@ impl eframe::App for App {
             if self.shortcuts_open && ui::shortcuts::show(ctx) {
                 actions.push(Action::ToggleShortcuts);
             }
-            self.toasts.show(ctx, covered);
+            if let Some(action) = self.toasts.show(ctx, covered) {
+                actions.push(action);
+            }
         }
 
         for action in actions {

crates/pstr-app/src/ui/library.rs

@@ -441,16 +441,10 @@ fn tile_menu(
             })
             .clicked()
         {
-            for episode in title.episodes() {
+            actions.push(Action::SetTitleWatched {
-                if episode.is_watched() == all_watched {
+                key: title.key.clone(),
-                    actions.push(Action::SetWatched {
+                watched: !all_watched,
-                        share_id: episode.node.share_id.clone(),
+            });
-                        link_id: episode.node.link_id.clone(),
-                        watched: !all_watched,
-                        duration: episode.watch.and_then(|watch| watch.duration_secs),
-                    });
-                }
-            }
         }
         if continuing
             && let Some(episode) = title.resume()
@@ -459,11 +453,9 @@ fn tile_menu(
                 .on_hover_text("Forget where you stopped in it")
                 .clicked()
         {
-            actions.push(Action::SetWatched {
+            actions.push(Action::ForgetPosition {
                 share_id: episode.node.share_id.clone(),
                 link_id: episode.node.link_id.clone(),
-                watched: false,
-                duration: episode.watch.and_then(|watch| watch.duration_secs),
             });
         }
 

crates/pstr-app/src/ui/toast.rs

@@ -7,6 +7,7 @@
 
 use egui::{Align2, Color32, CornerRadius, Sense, Stroke, Vec2};
 
+use crate::app::Action;
 use crate::theme;
 
 /// How long a message stays up.
@@ -24,6 +25,8 @@ pub struct Toast {
     text: String,
     error: bool,
     at: f64,
+    /// A button on the toast — "Undo" — and what it does.
+    action: Option<(&'static str, Action)>,
 }
 
 /// The messages on screen.
@@ -35,12 +38,33 @@ pub struct Toasts {
 
 impl Toasts {
     pub fn push(&mut self, now: f64, text: impl Into<String>, error: bool) {
-        let text = text.into();
+        self.push_inner(now, text.into(), error, None);
+    }
+
+    /// A message with a button on it, which runs `action` when pressed.
+    pub fn push_with(
+        &mut self,
+        now: f64,
+        text: impl Into<String>,
+        label: &'static str,
+        action: Action,
+    ) {
+        self.push_inner(now, text.into(), false, Some((label, action)));
+    }
+
+    fn push_inner(
+        &mut self,
+        now: f64,
+        text: String,
+        error: bool,
+        action: Option<(&'static str, Action)>,
+    ) {
         // The same message again — a retry that failed the same way — restarts
         // the one already up rather than stacking a copy of it.
         if let Some(existing) = self.items.iter_mut().find(|toast| toast.text == text) {
             existing.at = now;
             existing.error = error;
+            existing.action = action;
             return;
         }
         self.next += 1;
@@ -49,6 +73,7 @@ impl Toasts {
             text,
             error,
             at: now,
+            action,
         });
         if self.items.len() > MOST {
             self.items.remove(0);
@@ -56,11 +81,13 @@ impl Toasts {
     }
 
     /// Draw the stack above `bottom` points from the window's bottom edge, and
-    /// drop whatever has expired or been closed.
+    /// drop whatever has expired or been closed. Returns the action of a
-    pub fn show(&mut self, ctx: &egui::Context, bottom: f32) {
+    /// toast whose button was pressed.
+    pub fn show(&mut self, ctx: &egui::Context, bottom: f32) -> Option<Action> {
         let now = ctx.input(|input| input.time);
         let pointer = ctx.input(|input| input.pointer.hover_pos());
         let mut closed = None;
+        let mut pressed = None;
         let mut hovered = false;
         let mut y = ctx.content_rect().bottom() - bottom - 16.0;
         let right = ctx.content_rect().right() - 16.0;
@@ -82,8 +109,10 @@ impl Toasts {
                     ui.set_opacity(opacity);
                     card(ui, toast)
                 });
-            if area.inner {
+            match area.inner {
-                closed = Some(toast.id);
+                Pressed::Close => closed = Some(toast.id),
+                Pressed::Action => pressed = Some(toast.id),
+                Pressed::Nothing => {}
             }
             if pointer.is_some_and(|at| area.response.rect.contains(at)) {
                 hovered = true;
@@ -94,6 +123,12 @@ impl Toasts {
         if let Some(id) = closed {
             self.items.retain(|toast| toast.id != id);
         }
+        // Pressed once, and gone: an "Undo" left up after it ran is an
+        // invitation to undo the undo, which it does not do.
+        let action = pressed.and_then(|id| {
+            let index = self.items.iter().position(|toast| toast.id == id)?;
+            self.items.remove(index).action.map(|(_, action)| action)
+        });
         // Under the pointer, nothing leaves: someone is reading it.
         if hovered {
             for toast in &mut self.items {
@@ -107,6 +142,7 @@ impl Toasts {
             // Enough frames to animate the edges and to notice an expiry.
             ctx.request_repaint_after(std::time::Duration::from_millis(50));
         }
+        action
     }
 }
 
@@ -118,9 +154,16 @@ fn ease(t: f32) -> f32 {
     1.0 - (1.0 - t).powi(3)
 }
 
-/// One message. Returns whether its close button was pressed.
+/// Which of a toast's buttons was pressed.
-fn card(ui: &mut egui::Ui, toast: &Toast) -> bool {
+enum Pressed {
-    let mut close = false;
+    Nothing,
+    Close,
+    Action,
+}
+
+/// One message. Returns which of its buttons was pressed.
+fn card(ui: &mut egui::Ui, toast: &Toast) -> Pressed {
+    let mut pressed = Pressed::Nothing;
     let edge = if toast.error {
         theme::danger()
     } else {
@@ -145,30 +188,50 @@ fn card(ui: &mut egui::Ui, toast: &Toast) -> bool {
         .show(ui, |ui| {
             ui.set_width(WIDTH);
             let frame = ui.max_rect();
-            ui.horizontal(|ui| {
+            // The buttons first, from the right, so the text wraps in what
-                ui.add(
+            // they leave rather than pushing them off the card.
-                    egui::Label::new(theme::Role::Label.rich(&toast.text).color(theme::text()))
+            ui.with_layout(egui::Layout::right_to_left(egui::Align::Min), |ui| {
-                        .wrap(),
+                let (rect, response) = ui.allocate_exact_size(Vec2::splat(18.0), Sense::click());
+                let ink = if response.hovered() {
+                    theme::text()
+                } else {
+                    theme::muted()
+                };
+                let d = 4.0;
+                let c = rect.center();
+                ui.painter().line_segment(
+                    [c + Vec2::new(-d, -d), c + Vec2::new(d, d)],
+                    Stroke::new(1.5, ink),
                 );
-                ui.with_layout(egui::Layout::right_to_left(egui::Align::Min), |ui| {
+                ui.painter().line_segment(
-                    let (rect, response) =
+                    [c + Vec2::new(-d, d), c + Vec2::new(d, -d)],
-                        ui.allocate_exact_size(Vec2::splat(18.0), Sense::click());
+                    Stroke::new(1.5, ink),
-                    let ink = if response.hovered() {
+                );
-                        theme::text()
+                if response.on_hover_text("Dismiss").clicked() {
-                    } else {
+                    pressed = Pressed::Close;
-                        theme::muted()
+                }
-                    };
+                if let Some((label, _)) = &toast.action {
-                    let d = 4.0;
+                    ui.add_space(4.0);
-                    let c = rect.center();
+                    if ui
-                    ui.painter().line_segment(
+                        .add(
-                        [c + Vec2::new(-d, -d), c + Vec2::new(d, d)],
+                            egui::Button::new(
-                        Stroke::new(1.5, ink),
+                                theme::Role::Label
+                                    .rich(*label)
+                                    .strong()
+                                    .color(theme::accent()),
+                            )
+                            .frame(false),
+                        )
+                        .clicked()
+                    {
+                        pressed = Pressed::Action;
+                    }
+                }
+                ui.with_layout(egui::Layout::left_to_right(egui::Align::Min), |ui| {
+                    ui.add(
+                        egui::Label::new(theme::Role::Label.rich(&toast.text).color(theme::text()))
+                            .wrap(),
                     );
-                    ui.painter().line_segment(
-                        [c + Vec2::new(-d, d), c + Vec2::new(d, -d)],
-                        Stroke::new(1.5, ink),
-                    );
-                    close = response.on_hover_text("Dismiss").clicked();
                 });
             });
             // A strip down the leading edge says which kind it is before a word
@@ -179,7 +242,7 @@ fn card(ui: &mut egui::Ui, toast: &Toast) -> bool {
             );
             ui.painter().rect_filled(strip, CornerRadius::same(2), edge);
         });
-    close
+    pressed
 }
 
 #[cfg(test)]