summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2020-03-29 15:16:36 +0200
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2020-03-29 15:16:36 +0200
commit49bcebb1e5de9957bd0a9d7274371e3550569fa8 (patch)
tree306517ad1d1860245738a027534e0a4ba59bbce2
parent3f7dd5059454d956373c0ec29e87cb278f3f9df7 (diff)
downloadiced-49bcebb1e5de9957bd0a9d7274371e3550569fa8.tar.gz
iced-49bcebb1e5de9957bd0a9d7274371e3550569fa8.tar.bz2
iced-49bcebb1e5de9957bd0a9d7274371e3550569fa8.zip
Remove unnecessary merge of `iced_wgpu::Defaults`
-rw-r--r--wgpu/src/renderer/widget/button.rs3
-rw-r--r--wgpu/src/renderer/widget/container.rs1
2 files changed, 1 insertions, 3 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/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) =