From 8d6f86b317303c06a0daf1ca3ce91c29670dd674 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Sun, 5 Jan 2020 18:11:54 +0100
Subject: [PATCH] Remove `background` from `Settings`

---
 native/src/renderer/windowed.rs |  3 +--
 src/settings.rs                 |  8 --------
 wgpu/src/renderer.rs            | 18 ++++++------------
 winit/src/application.rs        |  8 ++------
 winit/src/settings/mod.rs       |  6 ------
 5 files changed, 9 insertions(+), 34 deletions(-)

diff --git a/native/src/renderer/windowed.rs b/native/src/renderer/windowed.rs
index 30e08cb8..c3266e6c 100644
--- a/native/src/renderer/windowed.rs
+++ b/native/src/renderer/windowed.rs
@@ -1,4 +1,4 @@
-use crate::{Color, MouseCursor};
+use crate::MouseCursor;
 
 use raw_window_handle::HasRawWindowHandle;
 
@@ -21,7 +21,6 @@ pub trait Windowed: super::Renderer + Sized {
     /// top of the GUI on most scenarios.
     fn draw<T: AsRef<str>>(
         &mut self,
-        clear_color: Color,
         output: &Self::Output,
         overlay: &[T],
         target: &mut Self::Target,
diff --git a/src/settings.rs b/src/settings.rs
index b01e6fc8..b725ef9f 100644
--- a/src/settings.rs
+++ b/src/settings.rs
@@ -1,5 +1,4 @@
 //! Configure your application.
-use crate::Color;
 
 /// The settings of an application.
 #[derive(Debug, Clone, Copy, PartialEq)]
@@ -11,11 +10,6 @@ pub struct Settings {
     /// [`Window`]: struct.Window.html
     pub window: Window,
 
-    /// The default background [`Color`] of the application
-    ///
-    /// [`Color`]: ../struct.Color.html
-    pub background: Color,
-
     // TODO: Add `name` for web compatibility
     pub default_font: Option<&'static [u8]>,
 }
@@ -24,7 +18,6 @@ impl Default for Settings {
     fn default() -> Settings {
         Settings {
             window: Window::default(),
-            background: Color::WHITE,
             default_font: None,
         }
     }
@@ -63,7 +56,6 @@ impl From<Settings> for iced_winit::Settings {
                 decorations: settings.window.decorations,
                 platform_specific: Default::default(),
             },
-            background: settings.background,
         }
     }
 }
diff --git a/wgpu/src/renderer.rs b/wgpu/src/renderer.rs
index 7f0f0b89..8f0b2020 100644
--- a/wgpu/src/renderer.rs
+++ b/wgpu/src/renderer.rs
@@ -80,7 +80,6 @@ impl Renderer {
 
     fn draw<T: AsRef<str>>(
         &mut self,
-        clear_color: Color,
         (primitive, mouse_cursor): &(Primitive, MouseCursor),
         overlay: &[T],
         target: &mut Target,
@@ -102,15 +101,11 @@ impl Renderer {
                 resolve_target: None,
                 load_op: wgpu::LoadOp::Clear,
                 store_op: wgpu::StoreOp::Store,
-                clear_color: {
-                    let [r, g, b, a] = clear_color.into_linear();
-
-                    wgpu::Color {
-                        r: f64::from(r),
-                        g: f64::from(g),
-                        b: f64::from(b),
-                        a: f64::from(a),
-                    }
+                clear_color: wgpu::Color {
+                    r: 1.0,
+                    g: 1.0,
+                    b: 1.0,
+                    a: 1.0,
                 },
             }],
             depth_stencil_attachment: None,
@@ -443,12 +438,11 @@ impl Windowed for Renderer {
 
     fn draw<T: AsRef<str>>(
         &mut self,
-        clear_color: Color,
         output: &Self::Output,
         overlay: &[T],
         target: &mut Target,
     ) -> MouseCursor {
-        self.draw(clear_color, output, overlay, target)
+        self.draw(output, overlay, target)
     }
 }
 
diff --git a/winit/src/application.rs b/winit/src/application.rs
index d16c209c..da943660 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -281,12 +281,8 @@ pub trait Application: Sized {
                     resized = false;
                 }
 
-                let new_mouse_cursor = renderer.draw(
-                    settings.background,
-                    &primitive,
-                    &debug.overlay(),
-                    &mut target,
-                );
+                let new_mouse_cursor =
+                    renderer.draw(&primitive, &debug.overlay(), &mut target);
 
                 debug.render_finished();
 
diff --git a/winit/src/settings/mod.rs b/winit/src/settings/mod.rs
index 0384df32..b2290b46 100644
--- a/winit/src/settings/mod.rs
+++ b/winit/src/settings/mod.rs
@@ -1,6 +1,4 @@
 //! Configure your application.
-use crate::Color;
-
 #[cfg(target_os = "windows")]
 #[path = "windows.rs"]
 mod platform;
@@ -17,16 +15,12 @@ pub struct Settings {
     ///
     /// [`Window`]: struct.Window.html
     pub window: Window,
-
-    /// The default background color of the application
-    pub background: Color,
 }
 
 impl Default for Settings {
     fn default() -> Settings {
         Settings {
             window: Window::default(),
-            background: Color::WHITE,
         }
     }
 }