diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2019-11-13 07:34:07 +0100 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2019-11-13 07:36:50 +0100 |
| commit | 23370296024fc30b8721902955867c2fdab88832 (patch) | |
| tree | 83097972fe18eb0d8f55d671315217f3eed0edec /wgpu | |
| parent | 6857829dc3171fd68065498b6cd29f0ef02a8d43 (diff) | |
| download | iced-23370296024fc30b8721902955867c2fdab88832.tar.gz iced-23370296024fc30b8721902955867c2fdab88832.tar.bz2 iced-23370296024fc30b8721902955867c2fdab88832.zip | |
Remove default styling of `Button`
- A background will only show if explicitly set.
- `iced_wgpu` won't apply a `min_width` of 100 units anymore.
Diffstat (limited to 'wgpu')
| -rw-r--r-- | wgpu/src/renderer/widget/button.rs | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/wgpu/src/renderer/widget/button.rs b/wgpu/src/renderer/widget/button.rs index 3d5e42ba..a19c7d86 100644 --- a/wgpu/src/renderer/widget/button.rs +++ b/wgpu/src/renderer/widget/button.rs @@ -12,7 +12,7 @@ impl button::Renderer for Renderer { ) -> layout::Node { let padding = f32::from(button.padding); let limits = limits - .min_width(100) + .min_width(button.min_width) .width(button.width) .height(Length::Shrink) .pad(padding); @@ -56,28 +56,29 @@ impl button::Renderer for Renderer { }; ( - Primitive::Group { - primitives: vec![ - Primitive::Quad { - bounds: Rectangle { - x: bounds.x + 1.0, - y: bounds.y + shadow_offset, - ..bounds + match button.background { + None => content, + Some(background) => Primitive::Group { + primitives: vec![ + Primitive::Quad { + bounds: Rectangle { + x: bounds.x + 1.0, + y: bounds.y + shadow_offset, + ..bounds + }, + background: Background::Color( + [0.0, 0.0, 0.0, 0.5].into(), + ), + border_radius: button.border_radius, }, - background: Background::Color( - [0.0, 0.0, 0.0, 0.5].into(), - ), - border_radius: button.border_radius, - }, - Primitive::Quad { - bounds, - background: button.background.unwrap_or( - Background::Color([0.8, 0.8, 0.8].into()), - ), - border_radius: button.border_radius, - }, - content, - ], + Primitive::Quad { + bounds, + background, + border_radius: button.border_radius, + }, + content, + ], + }, }, if is_mouse_over { MouseCursor::Pointer |