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

fix: apply theme type when theme mode changes

Browse source
This commit is contained in:
Ashley Wulber 2023-10-11 16:59:44 -04:00
parent 086a7039a4
commit 931f0011b4
No known key found for this signature in database
GPG key ID: 5216D4F46A90A820
1 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/app/cosmic.rs
View file

@ -213,6 +213,7 @@ impl<T: Application> Cosmic<T> {
iced::Command::single(Action::Window(WindowAction::Close)) iced::Command::single(Action::Window(WindowAction::Close))
} }
#[allow(clippy::too_many_lines)]
fn cosmic_update(&mut self, message: Message) -> iced::Command<super::Message<T::Message>> { fn cosmic_update(&mut self, message: Message) -> iced::Command<super::Message<T::Message>> {
match message { match message {
Message::WindowResize(id, width, height) => { Message::WindowResize(id, width, height) => {
@ -330,7 +331,18 @@ impl<T: Application> Cosmic<T> {
} }
Message::SystemThemeModeChange(mode) => { Message::SystemThemeModeChange(mode) => {
let core = self.app.core_mut(); let core = self.app.core_mut();
let changed = core.system_theme_mode.is_dark != mode.is_dark;
core.system_theme_mode = mode; core.system_theme_mode = mode;
if changed {
THEME.with(move |t| {
let mut cosmic_theme = t.borrow_mut();
// Only apply update if the theme is set to load a system theme
if let ThemeType::System(_) = cosmic_theme.theme_type {
cosmic_theme.set_theme(crate::theme::system_preference().theme_type);
}
});
}
} }
} }