feat(notifications): toast body-click invokes the default action; hide the default from the button row (#217)

The freedesktop notification spec reserves the action key `default` for
click-to-activate — servers may skip rendering it as a button. Trollshell
did neither: body-click on a toast was dismiss-only (an actionable
notification, e.g. a chat message, was discarded instead of opened), and
`default` survived `parse_actions` unfiltered, so it rendered as a literal
button — burning one of the 3 capped slots, or a blank ghost button when
the app sends an empty label (`["default", ""]`, common in practice).

- `overlays/notifications.rs::build_card`: body-click now invokes the
  `default` action (if the notification carries one) then dismisses;
  default-less toasts keep today's plain dismiss-on-click.
- The visible actions row now excludes `default`, so `.take(3)` caps real
  secondary actions only.
- Added a small flat `x` dismiss button in the card header — load-bearing,
  not just symmetry: once body-click can open instead of discard, a
  default-carrying toast needs an explicit way to close it.
- `.ts-toast:hover { cursor: pointer }` so the card reads as clickable.
- `panels/notifications.rs::build_history_action_row` (the drawer history
  consumer) gets the same default-exclusion — it rendered the identical
  unfiltered actions list.
- Both consumers share the partition logic via a new
  `components/notif_actions.rs` (`default_action` / `visible_actions`)
  instead of duplicating the `key == "default"` check.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: vibechoom

assets/trollshell/style.css

@@ -596,6 +596,9 @@
      * off `min-width`. */
     box-shadow: 0 6px 20px rgba(0, 0, 0, 0.35);
 }
+.ts-toast:hover {
+    cursor: pointer;
+}
 .ts-toast-critical {
     border-color: @destructive_color;
 }
@@ -624,6 +627,14 @@
     border-radius: 0.615em;
     font-size: 0.923em;
 }
+.ts-toast-dismiss {
+    padding: 0.154em 0.308em;
+    border-radius: 0.462em;
+    opacity: 0.55;
+}
+.ts-toast-dismiss:hover {
+    opacity: 1;
+}
 
 /* ─── Password prompt ───────────────────────────────────────────── */
 

trollshell/src/components/mod.rs

@@ -12,5 +12,6 @@ pub mod format;
 pub mod history_row;
 pub mod layout;
 pub mod mpris_controls;
+pub mod notif_actions;
 pub mod power_profile;
 pub mod reactive_list;

trollshell/src/components/notif_actions.rs

@@ -0,0 +1,32 @@
+//! Shared partition logic for `Vec<Action>` on a notification or history
+//! entry.
+//!
+//! The freedesktop notification spec reserves the action key `"default"`
+//! for click-to-activate — the server is free not to render it as a
+//! button. Both the toast overlay (`overlays::notifications::build_card`)
+//! and the drawer history panel
+//! (`panels::notifications::build_history_action_row`) render a
+//! `.take(3)`-capped row of buttons from the same flat `Vec<Action>`
+//! shape; without this filter a `default` action (often carrying an
+//! empty label, since apps expect it to be invoked rather than shown)
+//! burns a slot as a literal or blank "ghost" button. The toast overlay
+//! additionally wires the `default` action to the card's body-click
+//! gesture via [`default_action`].
+
+use hytte::services::notifications::Action;
+
+/// The reserved action key (freedesktop notification spec) that activates
+/// on click rather than rendering as a button.
+const DEFAULT_ACTION_KEY: &str = "default";
+
+/// The `default` action, if `actions` carries one.
+pub(crate) fn default_action(actions: &[Action]) -> Option<&Action> {
+    actions.iter().find(|a| a.key == DEFAULT_ACTION_KEY)
+}
+
+/// Actions to render as buttons — everything except the reserved
+/// `default` key, in original order. Callers still cap the count
+/// themselves (e.g. `.take(3)`).
+pub(crate) fn visible_actions(actions: &[Action]) -> impl Iterator<Item = &Action> {
+    actions.iter().filter(|a| a.key != DEFAULT_ACTION_KEY)
+}

trollshell/src/overlays/notifications.rs

@@ -43,6 +43,8 @@ use hytte::services::notifications::{self, Notification, NotificationImage, Urge
 use hytte::services::notifications_mute;
 use hytte::ui::{Anchor, Margin, layer_window};
 
+use crate::components::notif_actions;
+
 // ── Constants ─────────────────────────────────────────────────────────────────
 
 /// Maximum number of non-critical toasts rendered as individual cards.
@@ -367,6 +369,21 @@ fn build_card(notif: &Notification) -> gtk::Widget {
     app_label.set_hexpand(true);
     header.append(&app_label);
 
+    // Explicit dismiss button. Load-bearing (not just symmetry): once
+    // body-click is wired to invoke a `default` action instead of
+    // dismissing (below), a default-carrying toast would otherwise have no
+    // way to close it without waiting out the timeout.
+    let dismiss_btn = gtk::Button::from_icon_name("window-close-symbolic");
+    dismiss_btn.add_css_class("flat");
+    dismiss_btn.add_css_class("ts-toast-dismiss");
+    dismiss_btn.set_valign(gtk::Align::Center);
+    dismiss_btn.set_tooltip_text(Some("Dismiss"));
+    let dismiss_id = notif.id;
+    dismiss_btn.connect_clicked(move |_| {
+        notifications::dismiss(dismiss_id, 2);
+    });
+    header.append(&dismiss_btn);
+
     column.append(&header);
 
     // Summary.
@@ -389,14 +406,16 @@ fn build_card(notif: &Notification) -> gtk::Widget {
         column.append(&body);
     }
 
-    // Action buttons (rendered only when actions are present). Cap at 3
-    // visible buttons so a chatty app (e.g. an "snooze 1m / 5m / 15m / 1h"
-    // calendar reminder) can't blow out the toast width — the rest stay
-    // accessible from the drawer history page.
-    if !notif.actions.is_empty() {
+    // Action buttons (rendered only when visible actions are present —
+    // the reserved `default` action is excluded, see `notif_actions`).
+    // Cap at 3 visible buttons so a chatty app (e.g. an "snooze 1m / 5m /
+    // 15m / 1h" calendar reminder) can't blow out the toast width — the
+    // rest stay accessible from the drawer history page.
+    let mut visible = notif_actions::visible_actions(&notif.actions).peekable();
+    if visible.peek().is_some() {
         let actions_row = gtk::Box::new(gtk::Orientation::Horizontal, 4);
         actions_row.add_css_class("ts-toast-actions");
-        for action in notif.actions.iter().take(3) {
+        for action in visible.take(3) {
             let btn = gtk::Button::with_label(&action.label);
             btn.add_css_class("ts-toast-action");
             let id = notif.id;
@@ -412,12 +431,19 @@ fn build_card(notif: &Notification) -> gtk::Widget {
 
     card.append(&column);
 
-    // Click anywhere on the card → dismiss (reason 2 = dismissed by user).
-    // Action buttons consume their own click events before it bubbles here.
+    // Click anywhere on the card → invoke the reserved `default` action
+    // (if the notification carries one) then dismiss (reason 2 =
+    // dismissed by user); with no `default` action this is a plain
+    // dismiss, same as before. Action/dismiss buttons consume their own
+    // click events before it bubbles here.
     let id = notif.id;
+    let default_key = notif_actions::default_action(&notif.actions).map(|a| a.key.clone());
     let gesture = gtk::GestureClick::new();
     gesture.connect_pressed(move |gesture, _, _, _| {
         gesture.set_state(gtk::EventSequenceState::Claimed);
+        if let Some(key) = &default_key {
+            notifications::invoke_action(id, key);
+        }
         notifications::dismiss(id, 2);
     });
     card.add_controller(gesture);

trollshell/src/panels/notifications.rs

@@ -14,6 +14,7 @@ use hytte::prelude::*;
 use hytte::services::{dnd, notifications, notifications_mute};
 
 use crate::components::layout::{finish_page, page_box};
+use crate::components::notif_actions;
 
 pub fn panel_notifications() -> gtk::Widget {
     let column = page_box();
@@ -188,11 +189,14 @@ fn build_history_action_row(entry: &notifications::HistoryEntry) -> adw::ActionR
     time_label.set_valign(gtk::Align::Center);
     row.add_prefix(&time_label);
 
-    // Action buttons (cap at 3 — same as toasts).
-    if !entry.actions.is_empty() {
+    // Action buttons (cap at 3 — same as toasts). The reserved `default`
+    // action is excluded — it's not meant to render as a button (see
+    // `notif_actions`).
+    let mut visible = notif_actions::visible_actions(&entry.actions).peekable();
+    if visible.peek().is_some() {
         let actions_box = gtk::Box::new(gtk::Orientation::Horizontal, 4);
         actions_box.set_valign(gtk::Align::Center);
-        for action in entry.actions.iter().take(3) {
+        for action in visible.take(3) {
             let btn = gtk::Button::with_label(&action.label);
             btn.add_css_class("flat");
             let id = entry.id;