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

refactor: introduce thread local THEME variable and distinguish between custom and system theme settings

Browse source
This commit is contained in:
Ashley Wulber 2023-08-04 15:48:34 -04:00 • committed by Ashley Wulber
parent 40efcbbe31
commit 6c57e04e36
8 changed files with 80 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/app/cosmic.rs
View file

@ -2,7 +2,7 @@
// SPDX-License-Identifier: MPL-2.0
use super::{command, Application, ApplicationExt, Core, Subscription};
use crate::theme::{self, Theme};
use crate::theme::{self, Theme, ThemeType, THEME};
use crate::widget::nav_bar;
use crate::{keyboard_nav, Element};
#[cfg(feature = "wayland")]
@ -36,6 +36,8 @@ pub enum Message {
ScaleFactor(f32),
/// Requests theme changes.
ThemeChange(Theme),
/// Notification of system theme changes.
SystemThemeChange(Theme),
/// Toggles visibility of the nav bar.
ToggleNavBar,
/// Toggles the condensed status of the nav bar.
@ -146,14 +148,14 @@ where
.map(Message::KeyboardNav)
.map(super::Message::Cosmic),
theme::subscription(0)
.map(Message::ThemeChange)
.map(Message::SystemThemeChange)
.map(super::Message::Cosmic),
window_events.map(super::Message::Cosmic),
])
}
fn theme(&self) -> Self::Theme {
self.app.core().theme.clone()
THEME.with(|t| t.borrow().clone())
}
#[cfg(feature = "wayland")]
@ -267,12 +269,32 @@ impl<T: Application> Cosmic<T> {
}
Message::ThemeChange(theme) => {
self.app.core_mut().theme = theme;
// our system theme is always receiving updates so we should use it instead
let theme = if matches!(theme.theme_type, ThemeType::System(_)) {
self.app.core().system_theme.clone()
} else {
theme
};
THEME.with(move |t| {
let mut cosmic_theme = t.borrow_mut();
cosmic_theme.set_theme(theme.theme_type);
});
}
Message::ScaleFactor(factor) => {
self.app.core_mut().set_scale_factor(factor);
}
Message::SystemThemeChange(theme) => {
self.app.core_mut().system_theme = theme.clone();
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 matches!(cosmic_theme.theme_type, ThemeType::System(_)) {
cosmic_theme.set_theme(theme.theme_type);
}
});
}
}
iced::Command::none()