diff options
Diffstat (limited to '')
| -rw-r--r-- | src/toggler.rs | 34 |
1 files changed, 12 insertions, 22 deletions
diff --git a/src/toggler.rs b/src/toggler.rs index cf2aa1d..61e11a7 100644 --- a/src/toggler.rs +++ b/src/toggler.rs @@ -42,47 +42,37 @@ pub fn default(theme: &Theme, status: Status) -> Style { match status { Status::Active { is_toggled } => { if is_toggled { - styled( - primary.color, - primary.on_primary, - surface.on_surface, - None, - ) + styled(primary.color, primary.text, surface.text, None) } else { styled( - surface.surface_container.highest, + surface.container.highest, theme.colors().outline.color, - surface.on_surface, + surface.text, Some(theme.colors().outline.color), ) } } Status::Hovered { is_toggled } => { if is_toggled { - styled( - primary.color, - primary.primary_container, - surface.on_surface, - None, - ) + styled(primary.color, primary.container, surface.text, None) } else { styled( mix( - surface.surface_container.highest, - surface.on_surface, + surface.container.highest, + surface.text, HOVERED_LAYER_OPACITY, ), - surface.on_surface_variant, - surface.on_surface, + surface.text_variant, + surface.text, Some(theme.colors().outline.color), ) } } Status::Disabled => styled( - disabled_container(surface.surface_container.highest), - disabled_text(surface.on_surface), - surface.on_surface, - Some(disabled_text(surface.on_surface)), + disabled_container(surface.container.highest), + disabled_text(surface.text), + surface.text, + Some(disabled_text(surface.text)), ), } } |