diff options
| author |  Héctor Ramón <hector0193@gmail.com> | 2019-11-07 17:44:27 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2019-11-07 17:44:27 +0100 |
| commit | 59ef7f074c67126dd8bd0ae9cbc82ce2a946258f (patch) | |
| tree | 5004ae812a39d36b3880d340101806edcf6abd04 /wgpu/src/renderer/widget/slider.rs | |
| parent | 6790f4b6e36f21b5db9ef02f5e499df8336abfea (diff) | |
| parent | e7bd24c13eb0c5c2b8ecf3f09f9e2de315bf8a41 (diff) | |
| download | iced-59ef7f074c67126dd8bd0ae9cbc82ce2a946258f.tar.gz iced-59ef7f074c67126dd8bd0ae9cbc82ce2a946258f.tar.bz2 iced-59ef7f074c67126dd8bd0ae9cbc82ce2a946258f.zip | |
Merge pull request #46 from memoryruins/from-array
impl From<Array> for Color
Diffstat (limited to 'wgpu/src/renderer/widget/slider.rs')
| -rw-r--r-- | wgpu/src/renderer/widget/slider.rs | 44 |
1 files changed, 11 insertions, 33 deletions
diff --git a/wgpu/src/renderer/widget/slider.rs b/wgpu/src/renderer/widget/slider.rs index 4ae3abc4..789e7bd4 100644 --- a/wgpu/src/renderer/widget/slider.rs +++ b/wgpu/src/renderer/widget/slider.rs @@ -37,12 +37,7 @@ impl slider::Renderer for Renderer { width: bounds.width, height: 2.0, }, - background: Background::Color(Color { - r: 0.6, - g: 0.6, - b: 0.6, - a: 1.0, - }), + background: Background::Color([0.6, 0.6, 0.6].into()), border_radius: 0, }, Primitive::Quad { @@ -71,12 +66,7 @@ impl slider::Renderer for Renderer { width: HANDLE_WIDTH + 2.0, height: HANDLE_HEIGHT + 2.0, }, - background: Background::Color(Color { - r: 0.6, - g: 0.6, - b: 0.6, - a: 1.0, - }), + background: Background::Color([0.6, 0.6, 0.6].into()), border_radius: 5, }, Primitive::Quad { @@ -86,28 +76,16 @@ impl slider::Renderer for Renderer { width: HANDLE_WIDTH, height: HANDLE_HEIGHT, }, - background: Background::Color(if slider.state.is_dragging() { - Color { - r: 0.85, - g: 0.85, - b: 0.85, - a: 1.0, + background: Background::Color( + if slider.state.is_dragging() { + [0.85, 0.85, 0.85] + } else if is_mouse_over { + [0.90, 0.90, 0.90] + } else { + [0.95, 0.95, 0.95] } - } else if is_mouse_over { - Color { - r: 0.9, - g: 0.9, - b: 0.9, - a: 1.0, - } - } else { - Color { - r: 0.95, - g: 0.95, - b: 0.95, - a: 1.0, - } - }), + .into(), + ), border_radius: 4, }, ); |