From 7b8b01f560569ae18d9337a31ba94f6c1c2ba0dd Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sat, 4 Feb 2023 12:24:13 +0100
Subject: Use `f32` in `Length::Units` and rename it to `Fixed`

---
 native/src/widget/vertical_slider.rs | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'native/src/widget/vertical_slider.rs')

diff --git a/native/src/widget/vertical_slider.rs b/native/src/widget/vertical_slider.rs
index 28e8405c..7363b55f 100644
--- a/native/src/widget/vertical_slider.rs
+++ b/native/src/widget/vertical_slider.rs
@@ -47,7 +47,7 @@ where
     value: T,
     on_change: Box<dyn Fn(T) -> Message + 'a>,
     on_release: Option<Message>,
-    width: u16,
+    width: f32,
     height: Length,
     style: <Renderer::Theme as StyleSheet>::Style,
 }
@@ -60,7 +60,7 @@ where
     Renderer::Theme: StyleSheet,
 {
     /// The default width of a [`VerticalSlider`].
-    pub const DEFAULT_WIDTH: u16 = 22;
+    pub const DEFAULT_WIDTH: f32 = 22.0;
 
     /// Creates a new [`VerticalSlider`].
     ///
@@ -110,14 +110,14 @@ where
     }
 
     /// Sets the width of the [`VerticalSlider`].
-    pub fn width(mut self, width: u16) -> Self {
+    pub fn width(mut self, width: f32) -> Self {
         self.width = width;
         self
     }
 
     /// Sets the height of the [`VerticalSlider`].
-    pub fn height(mut self, height: Length) -> Self {
-        self.height = height;
+    pub fn height(mut self, height: impl Into<Length>) -> Self {
+        self.height = height.into();
         self
     }
 
@@ -166,9 +166,7 @@ where
         _renderer: &Renderer,
         limits: &layout::Limits,
     ) -> layout::Node {
-        let limits =
-            limits.width(Length::Units(self.width)).height(self.height);
-
+        let limits = limits.width(self.width).height(self.height);
         let size = limits.resolve(Size::ZERO);
 
         layout::Node::new(size)
-- 
cgit 


From 67e3da56690c0681469276f7fa8155bbfc6e585a Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Fri, 17 Feb 2023 15:55:12 +0100
Subject: Use `Pixels` for `Slider::height` and `VerticalSlider::width`

---
 native/src/widget/vertical_slider.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'native/src/widget/vertical_slider.rs')

diff --git a/native/src/widget/vertical_slider.rs b/native/src/widget/vertical_slider.rs
index 7363b55f..0e2f5fc9 100644
--- a/native/src/widget/vertical_slider.rs
+++ b/native/src/widget/vertical_slider.rs
@@ -9,7 +9,7 @@ use crate::event::{self, Event};
 use crate::widget::tree::{self, Tree};
 use crate::{
     layout, mouse, renderer, touch, Background, Clipboard, Color, Element,
-    Layout, Length, Point, Rectangle, Shell, Size, Widget,
+    Layout, Length, Pixels, Point, Rectangle, Shell, Size, Widget,
 };
 
 /// An vertical bar and a handle that selects a single value from a range of
@@ -110,8 +110,8 @@ where
     }
 
     /// Sets the width of the [`VerticalSlider`].
-    pub fn width(mut self, width: f32) -> Self {
-        self.width = width;
+    pub fn width(mut self, width: impl Into<Pixels>) -> Self {
+        self.width = width.into().0;
         self
     }
 
-- 
cgit 


From 96c0bd65df5b85682a2d674b231a5ed420f106fb Mon Sep 17 00:00:00 2001
From: Casper Storm <casper.storm@lich.io>
Date: Mon, 20 Feb 2023 12:24:31 +0100
Subject: Sliders no longer bleed over rail

---
 native/src/widget/vertical_slider.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'native/src/widget/vertical_slider.rs')

diff --git a/native/src/widget/vertical_slider.rs b/native/src/widget/vertical_slider.rs
index 28e8405c..0302f3cf 100644
--- a/native/src/widget/vertical_slider.rs
+++ b/native/src/widget/vertical_slider.rs
@@ -418,8 +418,8 @@ pub fn draw<T, R>(
     let handle_offset = if range_start >= range_end {
         0.0
     } else {
-        bounds.height * (value - range_end) / (range_start - range_end)
-            - handle_width / 2.0
+        (bounds.height - handle_width) * (value - range_end)
+            / (range_start - range_end)
     };
 
     renderer.fill_quad(
-- 
cgit