leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: call the close requested method

Browse source
This commit is contained in:
Ashley Wulber 2024-02-05 19:23:11 -05:00 • committed by Ashley Wulber
parent 5606306044
commit 054b93990b
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/app/cosmic.rs
View file

@ -21,7 +21,7 @@ use iced::wayland::Application as IcedApplication;
use iced::window; use iced::window;
#[cfg(not(any(feature = "multi-window", feature = "wayland")))] #[cfg(not(any(feature = "multi-window", feature = "wayland")))]
use iced::Application as IcedApplication; use iced::Application as IcedApplication;
use iced_futures::event::listen_raw; use iced_futures::event::{listen_raw, listen_with};
#[cfg(not(feature = "wayland"))] #[cfg(not(feature = "wayland"))]
use iced_runtime::command::Action; use iced_runtime::command::Action;
#[cfg(not(feature = "wayland"))] #[cfg(not(feature = "wayland"))]
@ -64,6 +64,7 @@ pub enum Message {
/// Capabilities the window manager supports /// Capabilities the window manager supports
#[cfg(feature = "wayland")] #[cfg(feature = "wayland")]
WmCapabilities(window::Id, WindowManagerCapabilities), WmCapabilities(window::Id, WindowManagerCapabilities),
SurfaceClosed(window::Id),
/// Activate the application /// Activate the application
Activate(String), Activate(String),
} }
@ -139,18 +140,19 @@ where
} }
fn subscription(&self) -> Subscription<Self::Message> { fn subscription(&self) -> Subscription<Self::Message> {
let window_events = listen_raw(|event, _| { let window_events = listen_with(|event, _| {
match event { match event {
iced::Event::Window(id, window::Event::Resized { width, height }) => { iced::Event::Window(id, window::Event::Resized { width, height }) => {
return Some(Message::WindowResize(id, width, height)); return Some(Message::WindowResize(id, width, height));
} }
iced::Event::Window(id, window::Event::Closed) => {
return Some(Message::SurfaceClosed(id))
}
#[cfg(feature = "wayland")] #[cfg(feature = "wayland")]
iced::Event::PlatformSpecific(PlatformSpecific::Wayland(event)) => match event { iced::Event::PlatformSpecific(PlatformSpecific::Wayland(event)) => match event {
wayland::Event::Window(WindowEvent::State(state), _surface, id) => { wayland::Event::Window(WindowEvent::State(state), _surface, id) => {
return Some(Message::WindowState(id, state)); return Some(Message::WindowState(id, state));
} }
wayland::Event::Window( wayland::Event::Window(
WindowEvent::WmCapabilities(capabilities), WindowEvent::WmCapabilities(capabilities),
_surface, _surface,
@ -158,7 +160,10 @@ where
) => { ) => {
return Some(Message::WmCapabilities(id, capabilities)); 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, _token,
); );
} }
Message::SurfaceClosed(id) => {
if let Some(msg) = self.app.on_close_requested(id) {
return self.app.update(msg);
}
}
} }
iced::Command::none() iced::Command::none()