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

12
src/app/command.rs
View file

@ -29,7 +29,7 @@ pub mod message {
impl crate::app::Core {
pub fn drag<M: Send + 'static>(&self, id: Option<window::Id>) -> iced::Task<Message<M>> {
let Some(id) = id.or(self.main_window.get().cloned()) else {
let Some(id) = id.or(self.main_window) else {
return iced::Task::none();
};
crate::command::drag(id).map(Message::Cosmic)
@ -40,14 +40,14 @@ impl crate::app::Core {
id: Option<window::Id>,
maximized: bool,
) -> iced::Task<Message<M>> {
let Some(id) = id.or(self.main_window.get().cloned()) else {
let Some(id) = id.or(self.main_window) else {
return iced::Task::none();
};
crate::command::maximize(id, maximized).map(Message::Cosmic)
}
pub fn minimize<M: Send + 'static>(&self, id: Option<window::Id>) -> iced::Task<Message<M>> {
let Some(id) = id.or(self.main_window.get().cloned()) else {
let Some(id) = id.or(self.main_window) else {
return iced::Task::none();
};
crate::command::minimize(id).map(Message::Cosmic)
@ -62,7 +62,7 @@ impl crate::app::Core {
id: Option<window::Id>,
title: String,
) -> iced::Task<Message<M>> {
let Some(id) = id.or(self.main_window.get().cloned()) else {
let Some(id) = id.or(self.main_window) else {
return iced::Task::none();
};
crate::command::set_title(id, title).map(Message::Cosmic)
@ -72,7 +72,7 @@ impl crate::app::Core {
&self,
id: Option<window::Id>,
) -> iced::Task<Message<M>> {
let Some(id) = id.or(self.main_window.get().cloned()) else {
let Some(id) = id.or(self.main_window) else {
return iced::Task::none();
};
crate::command::set_windowed(id).map(Message::Cosmic)
@ -82,7 +82,7 @@ impl crate::app::Core {
&self,
id: Option<window::Id>,
) -> iced::Task<Message<M>> {
let Some(id) = id.or(self.main_window.get().cloned()) else {
let Some(id) = id.or(self.main_window) else {
return iced::Task::none();
};
crate::command::toggle_maximize(id).map(Message::Cosmic)