diff --git a/src/theme/style/iced.rs b/src/theme/style/iced.rs index 97246369..0a09a179 100644 --- a/src/theme/style/iced.rs +++ b/src/theme/style/iced.rs @@ -775,12 +775,12 @@ impl slider::Catalog for Theme { handle: slider::Handle { shape: slider::HandleShape::Rectangle { - height: 20, - width: 20, + height: 26, + width: 26, border_radius: cosmic.corner_radii.radius_m.into(), }, border_color: Color::TRANSPARENT, - border_width: 0.0, + border_width: 3.0, background: Background::Color(cosmic.accent.base.into()), }, @@ -795,12 +795,6 @@ impl slider::Catalog for Theme { slider::Status::Active => appearance, slider::Status::Hovered => match class { Slider::Standard => { - appearance.handle.shape = slider::HandleShape::Rectangle { - height: 26, - width: 26, - border_radius: cosmic.corner_radii.radius_m.into(), - }; - appearance.handle.border_width = 3.0; appearance.handle.border_color = self.cosmic().palette.neutral_10.with_alpha(0.1).into(); appearance @@ -809,20 +803,9 @@ impl slider::Catalog for Theme { }, slider::Status::Dragged => match class { Slider::Standard => { - let mut style = { - appearance.handle.shape = slider::HandleShape::Rectangle { - height: 26, - width: 26, - border_radius: cosmic.corner_radii.radius_m.into(), - }; - appearance.handle.border_width = 3.0; - appearance.handle.border_color = - self.cosmic().palette.neutral_10.with_alpha(0.1).into(); - appearance - }; - style.handle.border_color = + appearance.handle.border_color = self.cosmic().palette.neutral_10.with_alpha(0.2).into(); - style + appearance } Slider::Custom { dragging, .. } => dragging(self), }, diff --git a/src/widget/color_picker/mod.rs b/src/widget/color_picker/mod.rs index ab0f73fc..4041c934 100644 --- a/src/widget/color_picker/mod.rs +++ b/src/widget/color_picker/mod.rs @@ -360,7 +360,9 @@ where }) .step(4.0 / 17.0) .shift_step(64.0 / 17.0) - .width(self.width), + .width(self.width) + .handle_height(16) + .handle_width(16), text_input("", self.input_color) .on_input(move |s| on_update(ColorPickerUpdate::Input(s))) .on_paste(move |s| on_update(ColorPickerUpdate::Input(s)))