diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-06-01 22:07:29 +0200 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-06-01 22:07:29 +0200 |
| commit | b96d87ff6917e7dc75178e4c623d20d577ef583f (patch) | |
| tree | 87da05d984bbac2458c41caf0cea8c5b2cc26c46 /wgpu | |
| parent | 2ba9598f8022bf3035d97f1a30e53117b9619235 (diff) | |
| download | iced-b96d87ff6917e7dc75178e4c623d20d577ef583f.tar.gz iced-b96d87ff6917e7dc75178e4c623d20d577ef583f.tar.bz2 iced-b96d87ff6917e7dc75178e4c623d20d577ef583f.zip | |
Revert "Merge pull request #371 from myfreeweb/window-alpha"
This reverts commit 2ba9598f8022bf3035d97f1a30e53117b9619235, reversing
changes made to d34f8e06c8e3cdbba07a272f346163cfc0f920a6.
Diffstat (limited to 'wgpu')
| -rw-r--r-- | wgpu/src/settings.rs | 7 | ||||
| -rw-r--r-- | wgpu/src/window/compositor.rs | 8 |
2 files changed, 5 insertions, 10 deletions
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, |