From 49bcebb1e5de9957bd0a9d7274371e3550569fa8 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sun, 29 Mar 2020 15:16:36 +0200 Subject: Remove unnecessary merge of `iced_wgpu::Defaults` --- wgpu/src/renderer/widget/button.rs | 3 +-- wgpu/src/renderer/widget/container.rs | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'wgpu/src/renderer/widget') 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( &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/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) = -- cgit From 8b49968cabe46c4255a101105748394d55bc23a9 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sun, 29 Mar 2020 15:20:44 +0200 Subject: Remove redundant field assignment --- wgpu/src/renderer/widget/checkbox.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wgpu/src/renderer/widget') 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, -- cgit From 79fed3d69552011a0a5c2585892bb685e7657ee9 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sun, 29 Mar 2020 15:21:18 +0200 Subject: Remove unnecessary conversion in `iced_wgpu` --- wgpu/src/renderer/widget/text_input.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'wgpu/src/renderer/widget') 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, -- cgit