diff options
| author | 2020-06-01 22:07:29 +0200 | |
|---|---|---|
| committer | 2020-06-01 22:07:29 +0200 | |
| commit | b96d87ff6917e7dc75178e4c623d20d577ef583f (patch) | |
| tree | 87da05d984bbac2458c41caf0cea8c5b2cc26c46 /glow/src | |
| 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 '')
| -rw-r--r-- | glow/src/settings.rs | 7 | ||||
| -rw-r--r-- | glow/src/window/compositor.rs | 7 | 
2 files changed, 2 insertions, 12 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); | 
