Tweak icon preview buttons
* Preview buttons should be Image buttons with a modified style
This commit is contained in:
Josh Megnauth
parent
46374c69c1
commit
d4b422228d
2 changed files with 101 additions and 72 deletions
|
|
@ -451,7 +451,7 @@ impl Page {
|
||||||
let theme = cosmic::theme::active();
|
let theme = cosmic::theme::active();
|
||||||
let theme = theme.cosmic();
|
let theme = theme.cosmic();
|
||||||
cosmic::iced::widget::column![
|
cosmic::iced::widget::column![
|
||||||
// Export theme choice to GNOME
|
// Export theme choice
|
||||||
settings::view_section("").add(
|
settings::view_section("").add(
|
||||||
settings::item::builder(fl!("enable-export"))
|
settings::item::builder(fl!("enable-export"))
|
||||||
.description(fl!("enable-export", "desc"))
|
.description(fl!("enable-export", "desc"))
|
||||||
|
|
@ -460,22 +460,25 @@ impl Page {
|
||||||
// Icon theme previews
|
// Icon theme previews
|
||||||
// cosmic::iced::widget::column![text(&*ICON_THEME), text(&*ICON_THEME_DESC).size(10)]
|
// cosmic::iced::widget::column![text(&*ICON_THEME), text(&*ICON_THEME_DESC).size(10)]
|
||||||
// .spacing(2),
|
// .spacing(2),
|
||||||
text(&*ICON_THEME),
|
cosmic::iced::widget::column![
|
||||||
scrollable(
|
text(&*ICON_THEME),
|
||||||
flex_row(
|
scrollable(
|
||||||
self.icon_themes
|
flex_row(
|
||||||
.iter()
|
self.icon_themes
|
||||||
.zip(self.icon_handles.iter())
|
.iter()
|
||||||
.enumerate()
|
.zip(self.icon_handles.iter())
|
||||||
.map(|(i, (theme, handles))| {
|
.enumerate()
|
||||||
let selected = active.map(|j| i == j).unwrap_or_default();
|
.map(|(i, (theme, handles))| {
|
||||||
icon_theme_button(theme, handles, i, selected)
|
let selected = active.map(|j| i == j).unwrap_or_default();
|
||||||
})
|
icon_theme_button(theme, handles, i, selected)
|
||||||
.collect(),
|
})
|
||||||
|
.collect(),
|
||||||
|
)
|
||||||
|
.row_spacing(theme.space_xs())
|
||||||
|
.column_spacing(theme.space_xxxs())
|
||||||
)
|
)
|
||||||
.row_spacing(theme.space_xs())
|
]
|
||||||
.column_spacing(theme.space_xs())
|
.spacing(theme.space_xxs())
|
||||||
)
|
|
||||||
]
|
]
|
||||||
// .padding(theme.space_s())
|
// .padding(theme.space_s())
|
||||||
.spacing(theme.space_m())
|
.spacing(theme.space_m())
|
||||||
|
|
@ -878,10 +881,7 @@ impl Page {
|
||||||
}
|
}
|
||||||
Message::ExperimentalContextDrawer => {
|
Message::ExperimentalContextDrawer => {
|
||||||
self.context_view = Some(ContextView::Experimental);
|
self.context_view = Some(ContextView::Experimental);
|
||||||
|
cosmic::command::message(crate::app::Message::OpenContextDrawer("".into()))
|
||||||
cosmic::command::message(crate::app::Message::OpenContextDrawer(
|
|
||||||
fl!("experimental").into(),
|
|
||||||
))
|
|
||||||
}
|
}
|
||||||
Message::Daytime(day_time) => {
|
Message::Daytime(day_time) => {
|
||||||
self.day_time = day_time;
|
self.day_time = day_time;
|
||||||
|
|
@ -1479,7 +1479,7 @@ pub fn window_management() -> Section<crate::pages::Message> {
|
||||||
|
|
||||||
pub fn experimental() -> Section<crate::pages::Message> {
|
pub fn experimental() -> Section<crate::pages::Message> {
|
||||||
Section::default()
|
Section::default()
|
||||||
.descriptions(vec![fl!("experimental").into()])
|
.descriptions(vec![fl!("experimental-settings").into()])
|
||||||
.view::<Page>(|_binder, _page, section| {
|
.view::<Page>(|_binder, _page, section| {
|
||||||
let descriptions = &*section.descriptions;
|
let descriptions = &*section.descriptions;
|
||||||
settings::view_section("")
|
settings::view_section("")
|
||||||
|
|
@ -1673,60 +1673,89 @@ fn icon_theme_button(
|
||||||
) -> Element<'static, Message> {
|
) -> Element<'static, Message> {
|
||||||
let theme = cosmic::theme::active();
|
let theme = cosmic::theme::active();
|
||||||
let theme = theme.cosmic();
|
let theme = theme.cosmic();
|
||||||
cosmic::iced::widget::column![
|
// let image_style = cosmic::theme::Button::Image;
|
||||||
button(
|
let background = theme.palette.neutral_4.into();
|
||||||
cosmic::iced::widget::column![
|
|
||||||
row::Row::new()
|
cosmic::widget::column()
|
||||||
.extend(
|
.push(
|
||||||
handles
|
button::Button::new_image(
|
||||||
.iter()
|
cosmic::iced::widget::column![
|
||||||
.take(ICON_PREV_ROW)
|
cosmic::widget::row::row()
|
||||||
.cloned()
|
.extend(
|
||||||
.map(|handle| handle.icon().size(ICON_PREV_SIZE))
|
handles
|
||||||
|
.iter()
|
||||||
|
.take(ICON_PREV_ROW)
|
||||||
|
.cloned()
|
||||||
|
.map(|handle| handle.icon().size(ICON_PREV_SIZE))
|
||||||
|
)
|
||||||
|
.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()),
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
.on_press(Message::IconTheme(id))
|
||||||
|
.selected(selected)
|
||||||
|
.style(button::Style::Custom {
|
||||||
|
active: Box::new(move |focused, theme| {
|
||||||
|
icon_theme_style(
|
||||||
|
<cosmic::theme::Theme as button::StyleSheet>::active(
|
||||||
|
theme,
|
||||||
|
focused,
|
||||||
|
selected,
|
||||||
|
&cosmic::theme::Button::Image,
|
||||||
|
),
|
||||||
|
background,
|
||||||
)
|
)
|
||||||
.spacing(theme.space_xs()),
|
}),
|
||||||
row::Row::new()
|
disabled: Box::new(move |theme| {
|
||||||
.extend(
|
icon_theme_style(
|
||||||
handles
|
<cosmic::theme::Theme as button::StyleSheet>::disabled(
|
||||||
.iter()
|
theme,
|
||||||
.skip(ICON_PREV_ROW)
|
&cosmic::theme::Button::Image,
|
||||||
.cloned()
|
),
|
||||||
.map(|handle| handle.icon().size(ICON_PREV_SIZE))
|
background,
|
||||||
)
|
)
|
||||||
.spacing(theme.space_xs()),
|
}),
|
||||||
]
|
hovered: Box::new(move |focused, theme| {
|
||||||
.spacing(theme.space_xs()),
|
icon_theme_style(
|
||||||
|
<cosmic::theme::Theme as button::StyleSheet>::hovered(
|
||||||
|
theme,
|
||||||
|
focused,
|
||||||
|
selected,
|
||||||
|
&cosmic::theme::Button::Image,
|
||||||
|
),
|
||||||
|
background,
|
||||||
|
)
|
||||||
|
}),
|
||||||
|
pressed: Box::new(move |focused, theme| {
|
||||||
|
icon_theme_style(
|
||||||
|
<cosmic::theme::Theme as button::StyleSheet>::pressed(
|
||||||
|
theme,
|
||||||
|
focused,
|
||||||
|
selected,
|
||||||
|
&cosmic::theme::Button::Image,
|
||||||
|
),
|
||||||
|
background,
|
||||||
|
)
|
||||||
|
}),
|
||||||
|
}),
|
||||||
)
|
)
|
||||||
.on_press(Message::IconTheme(id))
|
.push(text(name.to_owned()).width(Length::Fixed((ICON_PREV_SIZE * 3) as _)))
|
||||||
.selected(selected)
|
.spacing(theme.space_xs())
|
||||||
.style(button::Style::Custom {
|
.into()
|
||||||
active: Box::new(move |focused, theme| icon_theme_style(theme, selected, focused)),
|
|
||||||
disabled: Box::new(move |theme| icon_theme_style(theme, selected, false)),
|
|
||||||
hovered: Box::new(move |focused, theme| icon_theme_style(theme, selected, focused)),
|
|
||||||
pressed: Box::new(move |focused, theme| icon_theme_style(theme, selected, focused))
|
|
||||||
}),
|
|
||||||
text(name.to_owned()).width(Length::Fixed((ICON_PREV_SIZE * 3) as _))
|
|
||||||
]
|
|
||||||
.spacing(theme.space_xs())
|
|
||||||
.into()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Icon preview button style.
|
/// Add background color to the thumbnails button.
|
||||||
fn icon_theme_style(
|
fn icon_theme_style(mut appearance: button::Appearance, background: Color) -> button::Appearance {
|
||||||
theme: &cosmic::theme::Theme,
|
appearance.background = Some(Background::Color(background));
|
||||||
selected: bool,
|
|
||||||
_focused: bool,
|
|
||||||
) -> button::Appearance {
|
|
||||||
let cosmic = theme.cosmic();
|
|
||||||
let mut appearance = button::Appearance::new();
|
|
||||||
|
|
||||||
appearance.background = Some(Background::Color(cosmic.palette.neutral_4.into()));
|
|
||||||
|
|
||||||
if selected {
|
|
||||||
appearance.border_width = 2.0;
|
|
||||||
appearance.border_color = cosmic.accent.base.into();
|
|
||||||
appearance.icon_color = Some(cosmic.accent.base.into());
|
|
||||||
}
|
|
||||||
|
|
||||||
appearance
|
appearance
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,7 @@ control-tint = Control component tint
|
||||||
frosted = Frosted glass effect on system interface
|
frosted = Frosted glass effect on system interface
|
||||||
.desc = Applies background blur to panel, dock, applets, launcher, and application library.
|
.desc = Applies background blur to panel, dock, applets, launcher, and application library.
|
||||||
|
|
||||||
experimental = Experimental
|
experimental-settings = Experimental settings
|
||||||
|
|
||||||
enable-export = Apply this theme to GNOME apps.
|
enable-export = Apply this theme to GNOME apps.
|
||||||
.desc = Not all toolkits support auto-switching. Non-COSMIC apps may need to be restarted after a theme change.
|
.desc = Not all toolkits support auto-switching. Non-COSMIC apps may need to be restarted after a theme change.
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue