leyoda/cosmic-greeter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

better syncing

Browse source
This commit is contained in:
Ashley Wulber 2025-08-07 19:05:31 -04:00 • committed by Jeremy Soller
parent 9c1306d8c7
commit 9a72c09fed
6 changed files with 144 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

26
daemon/src/lib.rs
View file

@ -8,7 +8,7 @@ use std::{
pub use cosmic_applets_config::time::TimeAppletConfig;
pub use cosmic_bg_config::{state::State as BgState, Color, Source as BgSource};
pub use cosmic_comp_config::{CosmicCompConfig, XkbConfig};
pub use cosmic_theme::Theme;
pub use cosmic_theme::{Theme, ThemeBuilder};
#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize)]
pub struct UserData {
@ -17,6 +17,7 @@ pub struct UserData {
pub full_name: String,
pub icon_opt: Option<Vec<u8>>,
pub theme_opt: Option<Theme>,
pub theme_builder_opt: Option<ThemeBuilder>,
pub bg_state: BgState,
pub bg_path_data: BTreeMap<PathBuf, Vec<u8>>,
pub xkb_config_opt: Option<XkbConfig>,
@ -59,6 +60,7 @@ impl UserData {
pub fn load_config_as_user(&mut self) {
self.icon_opt = None;
self.theme_opt = None;
self.theme_builder_opt = None;
self.bg_state = Default::default();
self.xkb_config_opt = None;
self.time_applet_config = Default::default();
@ -114,6 +116,28 @@ impl UserData {
}
}
match if is_dark {
cosmic_theme::ThemeBuilder::dark_config()
} else {
cosmic_theme::ThemeBuilder::light_config()
} {
Ok(helper) => match cosmic_theme::ThemeBuilder::get_entry(&helper) {
Ok(theme) => {
self.theme_builder_opt = Some(theme);
}
Err((errs, theme)) => {
log::error!("failed to load cosmic-theme builder config: {:?}", errs);
self.theme_builder_opt = Some(theme);
}
},
Err(err) => {
log::error!(
"failed to create cosmic-theme builder config helper: {:?}",
err
);
}
}
//TODO: fallback to background config if background state is not set?
match cosmic_bg_config::state::State::state() {
Ok(helper) => match cosmic_bg_config::state::State::get_entry(&helper) {