leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: theme color updates

Browse source
This commit is contained in:
Ashley Wulber 2025-07-21 10:49:47 -04:00 • committed by Michael Murphy
parent b8eaad2a7e
commit 8c4cb2e54f
8 changed files with 84 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/widget/color_picker/mod.rs
View file

@ -940,7 +940,7 @@ pub fn color_button<'a, Message: Clone + 'static>(
background: color.map(Background::from).or(standard.background),
border_radius: cosmic.radius_xs().into(),
border_width: 1.0,
border_color: cosmic.on_bg_color().into(),
border_color: cosmic.palette.neutral_8.into(),
outline_width,
outline_color,
icon_color: None,
@ -957,7 +957,7 @@ pub fn color_button<'a, Message: Clone + 'static>(
background: color.map(Background::from).or(standard.background),
border_radius: cosmic.radius_xs().into(),
border_width: 1.0,
border_color: cosmic.on_bg_color().into(),
border_color: cosmic.palette.neutral_8.into(),
outline_width: 0.0,
outline_color: Color::TRANSPARENT,
icon_color: None,
@ -980,7 +980,7 @@ pub fn color_button<'a, Message: Clone + 'static>(
background: color.map(Background::from).or(standard.background),
border_radius: cosmic.radius_xs().into(),
border_width: 1.0,
border_color: cosmic.on_bg_color().into(),
border_color: cosmic.palette.neutral_8.into(),
outline_width,
outline_color,
icon_color: None,
@ -1003,7 +1003,7 @@ pub fn color_button<'a, Message: Clone + 'static>(
background: color.map(Background::from).or(standard.background),
border_radius: cosmic.radius_xs().into(),
border_width: 1.0,
border_color: cosmic.on_bg_color().into(),
border_color: cosmic.palette.neutral_8.into(),
outline_width,
outline_color,
icon_color: None,

3
src/widget/menu/menu_tree.rs
View file

@ -262,7 +262,6 @@ pub fn menu_items<
items.insert(1, widget::Space::with_width(spacing.space_xxs).into());
}
// dbg!("button with action...", action.message());
let menu_button = menu_button(items).on_press(action.message());
trees.push(MenuTree::<Message>::from(Element::from(menu_button)));
@ -296,7 +295,7 @@ pub fn menu_items<
.icon()
.class(theme::Svg::Custom(Rc::new(|theme| {
iced_widget::svg::Style {
color: Some(theme.cosmic().accent_color().into()),
color: Some(theme.cosmic().accent_text_color().into()),
}
})))
.width(Length::Fixed(16.0))

6
src/widget/spin_button.rs
View file

@ -221,8 +221,8 @@ fn container_style(theme: &crate::Theme) -> iced_widget::container::Style {
let cosmic_theme = &theme.cosmic();
let accent = &cosmic_theme.accent;
let corners = &cosmic_theme.corner_radii;
let current_container = theme.current_container();
let border = if theme.theme_type.is_high_contrast() {
let current_container = theme.current_container();
Border {
radius: corners.radius_s.into(),
width: 1.,
@ -237,8 +237,8 @@ fn container_style(theme: &crate::Theme) -> iced_widget::container::Style {
};
iced_widget::container::Style {
icon_color: Some(accent.base.into()),
text_color: Some(cosmic_theme.palette.neutral_10.into()),
icon_color: Some(current_container.on.into()),
text_color: Some(current_container.on.into()),
background: None,
border,
shadow: Shadow::default(),