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

Capture theme content changes in addition to mode changes

Browse source
This commit is contained in:
Jeremy Soller 2024-01-31 15:18:20 -07:00
parent e73236fdac
commit 1ffb449bde
No known key found for this signature in database
GPG key ID: D02FD439211AF56F
1 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/main.rs
View file

@ -267,7 +267,7 @@ pub enum Message {
UseBrightBold(bool), UseBrightBold(bool),
ShowHeaderBar(bool), ShowHeaderBar(bool),
SyntaxTheme(usize, bool), SyntaxTheme(usize, bool),
SystemThemeModeChange(cosmic_theme::ThemeMode), SystemThemeChange,
TabActivate(segmented_button::Entity), TabActivate(segmented_button::Entity),
TabActivateJump(usize), TabActivateJump(usize),
TabClose(Option<segmented_button::Entity>), TabClose(Option<segmented_button::Entity>),
@ -1152,7 +1152,7 @@ impl Application for App {
return self.save_config(); return self.save_config();
} }
} }
Message::SystemThemeModeChange(_theme_mode) => { Message::SystemThemeChange => {
return self.update_config(); return self.update_config();
} }
Message::SyntaxTheme(index, dark) => match self.theme_names.get(index) { Message::SyntaxTheme(index, dark) => match self.theme_names.get(index) {
@ -1558,6 +1558,7 @@ impl Application for App {
struct ConfigSubscription; struct ConfigSubscription;
struct TerminalEventSubscription; struct TerminalEventSubscription;
struct ThemeSubscription; struct ThemeSubscription;
struct ThemeModeSubscription;
Subscription::batch([ Subscription::batch([
event::listen_with(|event, _status| match event { event::listen_with(|event, _status| match event {
@ -1608,21 +1609,23 @@ impl Application for App {
} }
Message::Config(update.config) Message::Config(update.config)
}), }),
cosmic_config::config_subscription::<_, cosmic_theme::ThemeMode>( cosmic_config::config_subscription::<_, cosmic_theme::Theme>(
TypeId::of::<ThemeSubscription>(), TypeId::of::<ThemeSubscription>(),
if self.core.system_theme_mode().is_dark {
cosmic_theme::DARK_THEME_ID
} else {
cosmic_theme::LIGHT_THEME_ID
}
.into(),
cosmic_theme::Theme::version(),
)
.map(|_update| Message::SystemThemeChange),
cosmic_config::config_subscription::<_, cosmic_theme::ThemeMode>(
TypeId::of::<ThemeModeSubscription>(),
cosmic_theme::THEME_MODE_ID.into(), cosmic_theme::THEME_MODE_ID.into(),
cosmic_theme::ThemeMode::version(), cosmic_theme::ThemeMode::version(),
) )
.map(|update| { .map(|_update| Message::SystemThemeChange),
if !update.errors.is_empty() {
log::debug!(
"errors loading theme mode {:?}: {:?}",
update.keys,
update.errors
);
}
Message::SystemThemeModeChange(update.config)
}),
]) ])
} }
} }