diff options
| -rw-r--r-- | glow/src/settings.rs | 7 | ||||
| -rw-r--r-- | glow/src/window/compositor.rs | 7 | ||||
| -rw-r--r-- | src/application.rs | 1 | ||||
| -rw-r--r-- | src/settings.rs | 28 | ||||
| -rw-r--r-- | wgpu/src/settings.rs | 7 | ||||
| -rw-r--r-- | wgpu/src/window/compositor.rs | 8 |
6 files changed, 9 insertions, 49 deletions
diff --git a/glow/src/settings.rs b/glow/src/settings.rs index 68fde714..dce30029 100644 --- a/glow/src/settings.rs +++ b/glow/src/settings.rs @@ -1,11 +1,10 @@ //! Configure a renderer. pub use iced_graphics::Antialiasing; -pub use iced_native::Color; /// The settings of a [`Renderer`]. /// /// [`Renderer`]: ../struct.Renderer.html -#[derive(Debug, Clone, Copy, PartialEq)] +#[derive(Debug, Clone, Copy, PartialEq, Eq)] pub struct Settings { /// The bytes of the font that will be used by default. /// @@ -14,9 +13,6 @@ pub struct Settings { /// The antialiasing strategy that will be used for triangle primitives. pub antialiasing: Option<Antialiasing>, - - /// The color that will be used to clear the window surface. - pub background_color: Color, } impl Default for Settings { @@ -24,7 +20,6 @@ impl Default for Settings { Settings { default_font: None, antialiasing: None, - background_color: Color::WHITE, } } } diff --git a/glow/src/window/compositor.rs b/glow/src/window/compositor.rs index c93191b0..2f504ff7 100644 --- a/glow/src/window/compositor.rs +++ b/glow/src/window/compositor.rs @@ -21,12 +21,7 @@ impl iced_graphics::window::GLCompositor for Compositor { ) -> (Self, Self::Renderer) { let gl = glow::Context::from_loader_function(loader_function); - gl.clear_color( - settings.background_color.r, - settings.background_color.g, - settings.background_color.b, - settings.background_color.a, - ); + gl.clear_color(1.0, 1.0, 1.0, 1.0); // Enable auto-conversion from/to sRGB gl.enable(glow::FRAMEBUFFER_SRGB); diff --git a/src/application.rs b/src/application.rs index a529580e..19cab7da 100644 --- a/src/application.rs +++ b/src/application.rs @@ -195,7 +195,6 @@ pub trait Application: Sized { } else { None }, - background_color: settings.background_color, ..crate::renderer::Settings::default() }; diff --git a/src/settings.rs b/src/settings.rs index 1aa17571..01ad0ee0 100644 --- a/src/settings.rs +++ b/src/settings.rs @@ -1,8 +1,8 @@ //! Configure your application. -use crate::{window, Color}; +use crate::window; /// The settings of an application. -#[derive(Debug, Clone, Copy, PartialEq)] +#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)] pub struct Settings<Flags> { /// The window settings. /// @@ -32,29 +32,6 @@ pub struct Settings<Flags> { /// /// [`Canvas`]: ../widget/canvas/struct.Canvas.html pub antialiasing: bool, - - /// The background color of the window. - /// - /// On supported backends, this makes it possible to have - /// (semi-)transparent windows. - /// - /// By default, it is white. - pub background_color: Color, -} - -impl<Flags> Default for Settings<Flags> -where - Flags: Default, -{ - fn default() -> Self { - Self { - flags: Default::default(), - antialiasing: Default::default(), - default_font: Default::default(), - window: Default::default(), - background_color: Color::WHITE, - } - } } impl<Flags> Settings<Flags> { @@ -69,7 +46,6 @@ impl<Flags> Settings<Flags> { antialiasing: Default::default(), default_font: Default::default(), window: Default::default(), - background_color: Color::WHITE, } } } diff --git a/wgpu/src/settings.rs b/wgpu/src/settings.rs index 16294ba3..4655e64f 100644 --- a/wgpu/src/settings.rs +++ b/wgpu/src/settings.rs @@ -1,11 +1,10 @@ //! Configure a renderer. pub use crate::Antialiasing; -pub use iced_native::Color; /// The settings of a [`Renderer`]. /// /// [`Renderer`]: ../struct.Renderer.html -#[derive(Debug, Clone, Copy, PartialEq)] +#[derive(Debug, Clone, Copy, PartialEq, Eq)] pub struct Settings { /// The output format of the [`Renderer`]. /// @@ -19,9 +18,6 @@ pub struct Settings { /// The antialiasing strategy that will be used for triangle primitives. pub antialiasing: Option<Antialiasing>, - - /// The color that will be used to clear the window surface. - pub background_color: Color, } impl Default for Settings { @@ -30,7 +26,6 @@ impl Default for Settings { format: wgpu::TextureFormat::Bgra8UnormSrgb, default_font: None, antialiasing: None, - background_color: Color::WHITE, } } } diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs index f85986f0..8345679a 100644 --- a/wgpu/src/window/compositor.rs +++ b/wgpu/src/window/compositor.rs @@ -119,10 +119,10 @@ impl iced_graphics::window::Compositor for Compositor { load_op: wgpu::LoadOp::Clear, store_op: wgpu::StoreOp::Store, clear_color: wgpu::Color { - r: self.settings.background_color.r.into(), - g: self.settings.background_color.g.into(), - b: self.settings.background_color.b.into(), - a: self.settings.background_color.a.into(), + r: 1.0, + g: 1.0, + b: 1.0, + a: 1.0, }, }], depth_stencil_attachment: None, |