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

Drop dbus-config, update libcosmic, and use system_theme_update

Browse source
This commit is contained in:
Jeremy Soller 2025-06-23 11:37:22 -06:00
parent 1f94e54bee
commit cefa82f4e9
3 changed files with 124 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/app.rs
View file

@ -360,7 +360,7 @@ pub enum Message {
SearchInput(String),
SetShowDetails(bool),
SetTypeToSearch(TypeToSearch),
SystemThemeModeChange(cosmic_theme::ThemeMode),
SystemThemeModeChange,
Size(Size),
TabActivate(Entity),
TabNext,
@ -3356,7 +3356,7 @@ impl Application for App {
config_set!(type_to_search, type_to_search);
return self.update_config();
}
Message::SystemThemeModeChange(_theme_mode) => {
Message::SystemThemeModeChange => {
return self.update_config();
}
Message::TabActivate(entity) => {
@ -5214,6 +5214,14 @@ impl Application for App {
.into()
}
fn system_theme_update(
&mut self,
_keys: &[&'static str],
new_theme: &cosmic::cosmic_theme::Theme,
) -> Task<Self::Message> {
self.update(Message::SystemThemeModeChange)
}
fn subscription(&self) -> Subscription<Self::Message> {
struct ThemeSubscription;
struct WatcherSubscription;
@ -5268,21 +5276,6 @@ impl Application for App {
}
Message::Config(update.config)
}),
cosmic_config::config_subscription::<_, cosmic_theme::ThemeMode>(
TypeId::of::<ThemeSubscription>(),
cosmic_theme::THEME_MODE_ID.into(),
cosmic_theme::ThemeMode::version(),
)
.map(|update| {
if !update.errors.is_empty() {
log::info!(
"errors loading theme mode {:?}: {:?}",
update.keys,
update.errors
);
}
Message::SystemThemeModeChange(update.config)
}),
cosmic_config::config_subscription::<_, TimeConfig>(
TypeId::of::<TimeSubscription>(),
TIME_CONFIG_ID.into(),