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

14
src/app/core.rs
View file

@ -94,7 +94,7 @@ pub struct Core {
#[cfg(feature = "dbus-config")]
pub(crate) settings_daemon: Option<cosmic_settings_daemon::CosmicSettingsDaemonProxy<'static>>,
pub(crate) main_window: OnceCell<window::Id>,
pub(crate) main_window: Option<window::Id>,
pub(crate) exit_on_main_window_closed: bool,
}
@ -152,7 +152,7 @@ impl Default for Core {
portal_is_dark: None,
portal_accent: None,
portal_is_high_contrast: None,
main_window: OnceCell::new(),
main_window: None,
exit_on_main_window_closed: true,
}
}
@ -373,9 +373,11 @@ impl Core {
/// The [`Id`] of the main window
pub fn main_window_id(&self) -> Option<window::Id> {
self.main_window
.get()
.filter(|id| iced::window::Id::NONE != **id)
.cloned()
self.main_window.filter(|id| iced::window::Id::NONE != *id)
}
/// Reset the tracked main window to a new value
pub fn set_main_window_id(&mut self, id: window::Id) -> Option<window::Id> {
self.main_window.replace(id)
}
}