diff --git a/examples/calendar/src/main.rs b/examples/calendar/src/main.rs index c73c4da7bce..3dbd4e24120 100644 --- a/examples/calendar/src/main.rs +++ b/examples/calendar/src/main.rs @@ -111,7 +111,12 @@ where Self: cosmic::Application, { fn update_title(&mut self) -> Task { - self.set_header_title(String::from("Calendar Demo")); - self.set_window_title(String::from("Calendar Demo")) + let title = "Calendar Demo"; + self.set_header_title(title.to_owned()); + + self.core + .main_window_id() + .map(|window_id| self.set_window_title(title.into(), window_id)) + .unwrap_or_else(Task::none) } } diff --git a/examples/cosmic/src/window.rs b/examples/cosmic/src/window.rs index 9fce8767fd0..9d0fb2f5288 100644 --- a/examples/cosmic/src/window.rs +++ b/examples/cosmic/src/window.rs @@ -6,10 +6,10 @@ use cosmic::{ ThemeBuilder, }, font::load_fonts, - iced::{self, Application, Length, Subscription, Task}, + iced::{self, Length, Subscription, Task}, iced::{ subscription, - widget::{self, column, container, horizontal_space, row, text}, + widget::{self, column, horizontal_space, row, text}, window::{self, close, drag, minimize, toggle_maximize}, }, iced_futures::event::listen_raw, @@ -20,7 +20,7 @@ use cosmic::{ button, container, header_bar, icon, nav_bar, nav_bar_toggle, scrollable, segmented_button, settings, warning, }, - Element, + Application, Element, }; use cosmic_time::{Instant, Timeline}; use std::{ @@ -433,10 +433,10 @@ impl Application for Window { Message::ToggleNavBarCondensed => { self.nav_bar_toggled_condensed = !self.nav_bar_toggled_condensed } - Message::Drag => return drag(self.core.main_window_id().unwrap()), - Message::Close => return close(self.core.main_window_id().unwrap()), - Message::Minimize => return minimize(self.core.main_window_id().unwrap(), true), - Message::Maximize => return toggle_maximize(self.core.main_window_id().unwrap()), + Message::Drag => return drag(self.core().main_window_id().unwrap()), + Message::Close => return close(self.core().main_window_id().unwrap()), + Message::Minimize => return minimize(self.core().main_window_id().unwrap(), true), + Message::Maximize => return toggle_maximize(self.core().main_window_id().unwrap()), Message::InputChanged => {} diff --git a/examples/image-button/src/main.rs b/examples/image-button/src/main.rs index 34d907e745c..54b47d713fc 100644 --- a/examples/image-button/src/main.rs +++ b/examples/image-button/src/main.rs @@ -107,7 +107,11 @@ where Self: cosmic::Application, { fn update_title(&mut self) -> Task { - self.set_header_title(String::from("Image Button Demo")); - self.set_window_title(String::from("Image Button Demo")) + let title = "Image Button Demo"; + self.set_header_title(title.into()); + self.core + .main_window_id() + .map(|window_id| self.set_window_title(title.into(), window_id)) + .unwrap_or_else(Task::none) } } diff --git a/examples/text-input/src/main.rs b/examples/text-input/src/main.rs index 573b9dc142d..fededbf7d2c 100644 --- a/examples/text-input/src/main.rs +++ b/examples/text-input/src/main.rs @@ -118,6 +118,9 @@ where fn update_title(&mut self) -> Task { let window_title = format!("COSMIC TextInputs Demo"); self.set_header_title(window_title.clone()); - self.set_window_title(window_title) + self.core + .main_window_id() + .map(|window_id| self.set_window_title(window_title, window_id)) + .unwrap_or_else(Task::none) } } diff --git a/src/desktop.rs b/src/desktop.rs index 1fef2e7d0a3..407404a7d9f 100644 --- a/src/desktop.rs +++ b/src/desktop.rs @@ -10,6 +10,7 @@ pub trait IconSourceExt { fn as_cosmic_icon(&self) -> crate::widget::icon::Icon; } +#[cfg(not(windows))] impl IconSourceExt for fde::IconSource { fn as_cosmic_icon(&self) -> crate::widget::icon::Icon { match self {