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

Update icon theme preview buttons to match design

Browse source
This commit is contained in:
Josh Megnauth 2024-04-12 00:47:52 -04:00
parent 0e985b51b5
commit cbd6b2d350
No known key found for this signature in database
GPG key ID: 70813183462EFAD3
1 changed files with 40 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -34,9 +34,11 @@ use crate::app;
use super::wallpaper::widgets::color_image; use super::wallpaper::widgets::color_image;
const NUM_HANDLES: usize = 5; const ICON_PREV_N: usize = 6;
const ICON_PREV_ROW: usize = 3;
const ICON_PREV_SIZE: u16 = 32;
type IconThemes = Vec<String>; type IconThemes = Vec<String>;
type IconHandles = Vec<[icon::Handle; NUM_HANDLES]>; type IconHandles = Vec<[icon::Handle; ICON_PREV_N]>;
crate::cache_dynamic_lazy! { crate::cache_dynamic_lazy! {
static HEX: String = fl!("hex"); static HEX: String = fl!("hex");
@ -1594,18 +1596,19 @@ async fn set_gnome_icon_theme(theme: String) {
} }
/// Generate [icon::Handle]s to use for icon theme previews. /// Generate [icon::Handle]s to use for icon theme previews.
fn preview_handles(theme: String) -> [icon::Handle; NUM_HANDLES] { fn preview_handles(theme: String) -> [icon::Handle; ICON_PREV_N] {
// Cache current default and set icon theme as the new default. // Cache current default and set icon theme as a temporary default
let default = cosmic::icon_theme::default(); let default = cosmic::icon_theme::default();
cosmic::icon_theme::set_default(theme); cosmic::icon_theme::set_default(theme);
// Evaluate handles with the current theme // Evaluate handles with the temporary theme
let handles = [ let handles = [
icon_handle("folder"), icon_handle("folder"),
icon_handle("text-x-generic"), icon_handle("user-home"),
icon_handle("preferences-system"),
icon_handle("image-x-generic"),
icon_handle("audio-x-generic"), icon_handle("audio-x-generic"),
icon_handle("video-x-generic"), icon_handle("video-x-generic"),
icon_handle("image-x-generic"),
]; ];
// Reset default icon theme. // Reset default icon theme.
@ -1632,17 +1635,35 @@ fn icon_theme_button(
selected: bool, selected: bool,
) -> Element<'static, Message> { ) -> Element<'static, Message> {
let theme = cosmic::theme::active(); let theme = cosmic::theme::active();
button( let theme = theme.cosmic();
row::with_capacity(2) cosmic::iced::widget::column![
.push( button(
row::with_capacity(NUM_HANDLES) cosmic::iced::widget::column![
.extend(handles.iter().map(|handle| handle.clone().icon())), row::Row::new()
) .extend(
.push(text(name.to_owned())) handles
.spacing(theme.cosmic().space_m()), .iter()
) .take(ICON_PREV_ROW)
.on_press(Message::IconTheme(id)) .cloned()
.selected(selected) .map(|handle| handle.icon().size(ICON_PREV_SIZE))
.style(button::Style::Icon) )
.spacing(theme.space_xs()),
row::Row::new()
.extend(
handles
.iter()
.skip(ICON_PREV_ROW)
.cloned()
.map(|handle| handle.icon().size(ICON_PREV_SIZE))
)
.spacing(theme.space_xs()),
]
.spacing(theme.space_xs()),
)
.on_press(Message::IconTheme(id))
.selected(selected)
.style(button::Style::Icon),
text(name.to_owned())
]
.into() .into()
} }