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

fix(appearance): retain icon handles on page reload

Browse source
This commit is contained in:
Michael Aaron Murphy 2024-05-28 15:29:09 +02:00
parent d1a47cbded
commit f8f4bd17ee
No known key found for this signature in database
GPG key ID: B2732D4240C9212C
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
cosmic-settings/src/pages/desktop/appearance.rs
View file

@ -64,10 +64,10 @@ enum ContextView {
#[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd)] #[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd)]
struct IconTheme { struct IconTheme {
// GTK uses the name of the theme as specified in its index file
name: String,
// COSMIC uses the file name of the folder containing the theme // COSMIC uses the file name of the folder containing the theme
id: String, id: String,
// GTK uses the name of the theme as specified in its index file
name: String,
} }
pub struct Page { pub struct Page {
@ -468,8 +468,6 @@ impl Page {
.toggler(self.tk.apply_theme_global, Message::ApplyThemeGlobal) .toggler(self.tk.apply_theme_global, Message::ApplyThemeGlobal)
), ),
// Icon theme previews // Icon theme previews
// cosmic::iced::widget::column![text(&*ICON_THEME), text(&*ICON_THEME_DESC).size(10)]
// .spacing(2),
cosmic::widget::column::with_children(vec![ cosmic::widget::column::with_children(vec![
text::heading(&*ICON_THEME).into(), text::heading(&*ICON_THEME).into(),
flex_row( flex_row(
@ -489,9 +487,7 @@ impl Page {
]) ])
.spacing(theme.space_xxs()) .spacing(theme.space_xxs())
] ]
// .padding(theme.space_s())
.spacing(theme.space_m()) .spacing(theme.space_m())
// .align_items(cosmic::iced_core::Alignment::Center)
.width(Length::Fill) .width(Length::Fill)
.apply(Element::from) .apply(Element::from)
.map(crate::pages::Message::Appearance) .map(crate::pages::Message::Appearance)
@ -954,11 +950,14 @@ impl Page {
fn reload_theme_mode(&mut self) { fn reload_theme_mode(&mut self) {
let icon_themes = std::mem::take(&mut self.icon_themes); let icon_themes = std::mem::take(&mut self.icon_themes);
let icon_handles = std::mem::take(&mut self.icon_handles);
let icon_theme_active = self.icon_theme_active.take(); let icon_theme_active = self.icon_theme_active.take();
let day_time = self.day_time; let day_time = self.day_time;
*self = Self::from((self.theme_mode_config.clone(), self.theme_mode)); *self = Self::from((self.theme_mode_config.clone(), self.theme_mode));
self.day_time = day_time; self.day_time = day_time;
self.icon_themes = icon_themes; self.icon_themes = icon_themes;
self.icon_handles = icon_handles;
self.icon_theme_active = icon_theme_active; self.icon_theme_active = icon_theme_active;
} }
@ -1634,7 +1633,7 @@ async fn fetch_icon_themes() -> Message {
continue; continue;
}; };
let Some(id) = entry.file_name().to_str().map(|x| x.to_string()) else { let Some(id) = entry.file_name().to_str().map(String::from) else {
continue; continue;
}; };