diff options
author | 2019-08-31 04:31:13 +0200 | |
---|---|---|
committer | 2019-08-31 04:31:13 +0200 | |
commit | eecac7b5d163794645bcce8e450c74e3eb5e999f (patch) | |
tree | bf55576b1941bffae422050f72e7c9a6c1c0d282 /src/widget | |
parent | 343cafa1ee0b6d29d6e739dfebb13ebe3656a9aa (diff) | |
download | iced-eecac7b5d163794645bcce8e450c74e3eb5e999f.tar.gz iced-eecac7b5d163794645bcce8e450c74e3eb5e999f.tar.bz2 iced-eecac7b5d163794645bcce8e450c74e3eb5e999f.zip |
Remove `nalgebra` dependency
- Implement our own `Point` and `Vector` types
- Make `Rectangle` not generic
Diffstat (limited to 'src/widget')
-rw-r--r-- | src/widget/button.rs | 2 | ||||
-rw-r--r-- | src/widget/checkbox.rs | 4 | ||||
-rw-r--r-- | src/widget/panel.rs | 2 | ||||
-rw-r--r-- | src/widget/radio.rs | 4 | ||||
-rw-r--r-- | src/widget/slider.rs | 2 | ||||
-rw-r--r-- | src/widget/text.rs | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/src/widget/button.rs b/src/widget/button.rs index a3ee493c..14fd3852 100644 --- a/src/widget/button.rs +++ b/src/widget/button.rs @@ -263,7 +263,7 @@ pub trait Renderer { fn draw( &mut self, cursor_position: Point, - bounds: Rectangle<f32>, + bounds: Rectangle, state: &State, label: &str, class: Class, diff --git a/src/widget/checkbox.rs b/src/widget/checkbox.rs index b8a20d2c..a7561df1 100644 --- a/src/widget/checkbox.rs +++ b/src/widget/checkbox.rs @@ -182,8 +182,8 @@ pub trait Renderer { fn draw( &mut self, cursor_position: Point, - bounds: Rectangle<f32>, - label_bounds: Rectangle<f32>, + bounds: Rectangle, + label_bounds: Rectangle, is_checked: bool, ) -> MouseCursor; } diff --git a/src/widget/panel.rs b/src/widget/panel.rs index 28e5989c..d43d6fb6 100644 --- a/src/widget/panel.rs +++ b/src/widget/panel.rs @@ -90,5 +90,5 @@ where } pub trait Renderer { - fn draw(&mut self, bounds: Rectangle<f32>); + fn draw(&mut self, bounds: Rectangle); } diff --git a/src/widget/radio.rs b/src/widget/radio.rs index f7ee04e1..a59d52aa 100644 --- a/src/widget/radio.rs +++ b/src/widget/radio.rs @@ -192,8 +192,8 @@ pub trait Renderer { fn draw( &mut self, cursor_position: Point, - bounds: Rectangle<f32>, - label_bounds: Rectangle<f32>, + bounds: Rectangle, + label_bounds: Rectangle, is_selected: bool, ) -> MouseCursor; } diff --git a/src/widget/slider.rs b/src/widget/slider.rs index 531c2992..c7adbb51 100644 --- a/src/widget/slider.rs +++ b/src/widget/slider.rs @@ -222,7 +222,7 @@ pub trait Renderer { fn draw( &mut self, cursor_position: Point, - bounds: Rectangle<f32>, + bounds: Rectangle, state: &State, range: RangeInclusive<f32>, value: f32, diff --git a/src/widget/text.rs b/src/widget/text.rs index 2663765d..c4b7eabb 100644 --- a/src/widget/text.rs +++ b/src/widget/text.rs @@ -177,7 +177,7 @@ pub trait Renderer<Color> { /// [`VerticalAlignment`]: enum.VerticalAlignment.html fn draw( &mut self, - bounds: Rectangle<f32>, + bounds: Rectangle, content: &str, size: f32, color: Option<Color>, |