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

refactor: allow resetting the main window id

Browse source
This commit is contained in:
Ashley Wulber 2024-10-21 17:32:16 -04:00 • committed by Ashley Wulber
parent b44fe2c0b6
commit cf3ba4ca07
5 changed files with 29 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/app/cosmic.rs
View file

@ -79,7 +79,7 @@ pub enum Message {
#[cfg(feature = "applet")]
SuggestedBounds(Option<iced::Size>),
/// Window Created
MainWindowCreated(window::Id),
WindowCreated(window::Id),
}
#[derive(Default)]
@ -167,7 +167,7 @@ where
iced::Event::Window(window::Event::Focused) => return Some(Message::Focus(id)),
iced::Event::Window(window::Event::Unfocused) => return Some(Message::Unfocus(id)),
iced::Event::Window(window::Event::Opened { .. }) => {
return Some(Message::MainWindowCreated(id));
return Some(Message::WindowCreated(id));
}
#[cfg(feature = "wayland")]
iced::Event::PlatformSpecific(iced::event::PlatformSpecific::Wayland(event)) => {
@ -660,9 +660,12 @@ impl<T: Application> Cosmic<T> {
core.focused_window = None;
}
}
Message::MainWindowCreated(id) => {
Message::WindowCreated(id) => {
let core = self.app.core_mut();
_ = core.main_window.set(id);
// Set the main window if it was not set to something else
if core.main_window.is_none() {
core.main_window = Some(id);
}
}
#[cfg(feature = "applet")]
Message::SuggestedBounds(b) => {