From 8dccedbe14618f7b1abd03b9b5bd636095bb2286 Mon Sep 17 00:00:00 2001
From: Hendrik Hamerlinck <hendrik.hamerlinck@hammernet.be>
Date: Wed, 11 Feb 2026 22:34:22 +0100
Subject: [PATCH] feat(applets): add destroy tooltip popup action

This commit adds a new surface action to explicitly destroy the tooltip
popup on `TOOLTIP_WINDOW_ID`, allowing proper cleanup when minimizing
applets.
---
 src/app/cosmic.rs  | 11 +++++++++++
 src/applet/mod.rs  |  2 +-
 src/surface/mod.rs |  3 +++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/app/cosmic.rs b/src/app/cosmic.rs
index b732eee9..030ed041 100644
--- a/src/app/cosmic.rs
+++ b/src/app/cosmic.rs
@@ -230,6 +230,17 @@ where
                 iced_winit::commands::popup::destroy_popup(id)
             }
             #[cfg(all(feature = "wayland", target_os = "linux"))]
+            crate::surface::Action::DestroyTooltipPopup => {
+                #[cfg(feature = "applet")]
+                {
+                    iced_winit::commands::popup::destroy_popup(*crate::applet::TOOLTIP_WINDOW_ID)
+                }
+                #[cfg(not(feature = "applet"))]
+                {
+                    Task::none()
+                }
+            }
+            #[cfg(all(feature = "wayland", target_os = "linux"))]
             crate::surface::Action::DestroySubsurface(id) => {
                 iced_winit::commands::subsurface::destroy_subsurface(id)
             }
diff --git a/src/applet/mod.rs b/src/applet/mod.rs
index a3f5228b..a7fc4069 100644
--- a/src/applet/mod.rs
+++ b/src/applet/mod.rs
@@ -42,7 +42,7 @@ static AUTOSIZE_ID: LazyLock<iced::id::Id> =
 static AUTOSIZE_MAIN_ID: LazyLock<iced::id::Id> =
     LazyLock::new(|| iced::id::Id::new("cosmic-applet-autosize-main"));
 static TOOLTIP_ID: LazyLock<crate::widget::Id> = LazyLock::new(|| iced::id::Id::new("subsurface"));
-static TOOLTIP_WINDOW_ID: LazyLock<window::Id> = LazyLock::new(window::Id::unique);
+pub(crate) static TOOLTIP_WINDOW_ID: LazyLock<window::Id> = LazyLock::new(window::Id::unique);
 
 #[derive(Debug, Clone)]
 pub struct Context {
diff --git a/src/surface/mod.rs b/src/surface/mod.rs
index 4598ac7c..0dad6459 100644
--- a/src/surface/mod.rs
+++ b/src/surface/mod.rs
@@ -36,6 +36,8 @@ pub enum Action {
     ),
     /// Destroy a subsurface with a view function
     DestroyPopup(iced::window::Id),
+    /// Destroys the global tooltip popup subsurface
+    DestroyTooltipPopup,
 
     /// Create a window with a view function accepting the App as a parameter
     AppWindow(
@@ -85,6 +87,7 @@ impl std::fmt::Debug for Action {
             }
             Self::Popup(arg0, arg1) => f.debug_tuple("Popup").field(arg0).field(arg1).finish(),
             Self::DestroyPopup(arg0) => f.debug_tuple("DestroyPopup").field(arg0).finish(),
+            Self::DestroyTooltipPopup => f.debug_tuple("DestroyTooltipPopup").finish(),
             Self::ResponsiveMenuBar {
                 menu_bar,
                 limits,