From 054b93990be65504f22e57155900a6138f2effd4 Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Mon, 5 Feb 2024 19:23:11 -0500
Subject: [PATCH] refactor: call the close requested method

---
 src/app/cosmic.rs | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/app/cosmic.rs b/src/app/cosmic.rs
index 211bfc2..52f923e 100644
--- a/src/app/cosmic.rs
+++ b/src/app/cosmic.rs
@@ -21,7 +21,7 @@ use iced::wayland::Application as IcedApplication;
 use iced::window;
 #[cfg(not(any(feature = "multi-window", feature = "wayland")))]
 use iced::Application as IcedApplication;
-use iced_futures::event::listen_raw;
+use iced_futures::event::{listen_raw, listen_with};
 #[cfg(not(feature = "wayland"))]
 use iced_runtime::command::Action;
 #[cfg(not(feature = "wayland"))]
@@ -64,6 +64,7 @@ pub enum Message {
     /// Capabilities the window manager supports
     #[cfg(feature = "wayland")]
     WmCapabilities(window::Id, WindowManagerCapabilities),
+    SurfaceClosed(window::Id),
     /// Activate the application
     Activate(String),
 }
@@ -139,18 +140,19 @@ where
     }
 
     fn subscription(&self) -> Subscription<Self::Message> {
-        let window_events = listen_raw(|event, _| {
+        let window_events = listen_with(|event, _| {
             match event {
                 iced::Event::Window(id, window::Event::Resized { width, height }) => {
                     return Some(Message::WindowResize(id, width, height));
                 }
-
+                iced::Event::Window(id, window::Event::Closed) => {
+                    return Some(Message::SurfaceClosed(id))
+                }
                 #[cfg(feature = "wayland")]
                 iced::Event::PlatformSpecific(PlatformSpecific::Wayland(event)) => match event {
                     wayland::Event::Window(WindowEvent::State(state), _surface, id) => {
                         return Some(Message::WindowState(id, state));
                     }
-
                     wayland::Event::Window(
                         WindowEvent::WmCapabilities(capabilities),
                         _surface,
@@ -158,7 +160,10 @@ where
                     ) => {
                         return Some(Message::WmCapabilities(id, capabilities));
                     }
-
+                    wayland::Event::Popup(wayland::PopupEvent::Done, _, id)
+                    | wayland::Event::Layer(wayland::LayerEvent::Done, _, id) => {
+                        return Some(Message::SurfaceClosed(id));
+                    }
                     _ => (),
                 },
                 _ => (),
@@ -396,6 +401,11 @@ impl<T: Application> Cosmic<T> {
                     _token,
                 );
             }
+            Message::SurfaceClosed(id) => {
+                if let Some(msg) = self.app.on_close_requested(id) {
+                    return self.app.update(msg);
+                }
+            }
         }
 
         iced::Command::none()