diff options
| author |  Héctor Ramón <hector0193@gmail.com> | 2020-03-29 15:42:17 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2020-03-29 15:42:17 +0200 |
| commit | 5b2c71a708f907f2b3c73bcdf56fbca5cd80adde (patch) | |
| tree | a2189119225605bbecce4b983da9e95fc5e2415a /wgpu/src/renderer/widget | |
| parent | 57b2daa57e7312b3015817d8f400b3523f2e42a7 (diff) | |
| parent | 01bc95c2a3dcaf0c2916a2d2891094e1dc1e11e5 (diff) | |
| download | iced-5b2c71a708f907f2b3c73bcdf56fbca5cd80adde.tar.gz iced-5b2c71a708f907f2b3c73bcdf56fbca5cd80adde.tar.bz2 iced-5b2c71a708f907f2b3c73bcdf56fbca5cd80adde.zip | |
Merge pull request #242 from kaimast/master
Some more code cleanups.
Diffstat (limited to 'wgpu/src/renderer/widget')
| -rw-r--r-- | wgpu/src/renderer/widget/button.rs | 3 | ||||
| -rw-r--r-- | wgpu/src/renderer/widget/checkbox.rs | 2 | ||||
| -rw-r--r-- | wgpu/src/renderer/widget/container.rs | 1 | ||||
| -rw-r--r-- | wgpu/src/renderer/widget/text_input.rs | 3 |
4 files changed, 3 insertions, 6 deletions
diff --git a/wgpu/src/renderer/widget/button.rs b/wgpu/src/renderer/widget/button.rs index 0de5bf5c..359b4866 100644 --- a/wgpu/src/renderer/widget/button.rs +++ b/wgpu/src/renderer/widget/button.rs @@ -10,7 +10,7 @@ impl iced_native::button::Renderer for Renderer { fn draw<Message>( &mut self, - defaults: &Defaults, + _defaults: &Defaults, bounds: Rectangle, cursor_position: Point, is_disabled: bool, @@ -39,7 +39,6 @@ impl iced_native::button::Renderer for Renderer { text: defaults::Text { color: styling.text_color, }, - ..*defaults }, content_layout, cursor_position, diff --git a/wgpu/src/renderer/widget/checkbox.rs b/wgpu/src/renderer/widget/checkbox.rs index 1a0585d3..ecacf1de 100644 --- a/wgpu/src/renderer/widget/checkbox.rs +++ b/wgpu/src/renderer/widget/checkbox.rs @@ -38,7 +38,7 @@ impl checkbox::Renderer for Renderer { content: crate::text::CHECKMARK_ICON.to_string(), font: crate::text::BUILTIN_ICONS, size: bounds.height * 0.7, - bounds: bounds, + bounds, color: style.checkmark_color, horizontal_alignment: HorizontalAlignment::Center, vertical_alignment: VerticalAlignment::Center, diff --git a/wgpu/src/renderer/widget/container.rs b/wgpu/src/renderer/widget/container.rs index 2d4d1db8..dda7dc8a 100644 --- a/wgpu/src/renderer/widget/container.rs +++ b/wgpu/src/renderer/widget/container.rs @@ -19,7 +19,6 @@ impl iced_native::container::Renderer for Renderer { text: defaults::Text { color: style.text_color.unwrap_or(defaults.text.color), }, - ..*defaults }; let (content, mouse_cursor) = diff --git a/wgpu/src/renderer/widget/text_input.rs b/wgpu/src/renderer/widget/text_input.rs index 170ac3c5..9093b0c6 100644 --- a/wgpu/src/renderer/widget/text_input.rs +++ b/wgpu/src/renderer/widget/text_input.rs @@ -106,8 +106,7 @@ impl text_input::Renderer for Renderer { style_sheet.placeholder_color() } else { style_sheet.value_color() - } - .into(), + }, font, bounds: Rectangle { width: f32::INFINITY, |