diff options
| author | 2020-07-08 11:44:40 +0200 | |
|---|---|---|
| committer | 2020-07-08 11:44:40 +0200 | |
| commit | f3dfaa2c43bad16fc91660b2b73cb9173549e7ec (patch) | |
| tree | 353365f4dd1e3136bc651ac8c1572f62fff1304b /glow/src/window | |
| parent | 072ec69d53d2708d8fd1693151bcec7305efccf8 (diff) | |
| parent | 5c4f5ae5ecb36703a95cafb2cd58692529c9466d (diff) | |
| download | iced-f3dfaa2c43bad16fc91660b2b73cb9173549e7ec.tar.gz iced-f3dfaa2c43bad16fc91660b2b73cb9173549e7ec.tar.bz2 iced-f3dfaa2c43bad16fc91660b2b73cb9173549e7ec.zip  | |
Merge branch 'master' into feature/pane-grid-titlebar
Diffstat (limited to 'glow/src/window')
| -rw-r--r-- | glow/src/window/compositor.rs | 8 | 
1 files changed, 5 insertions, 3 deletions
diff --git a/glow/src/window/compositor.rs b/glow/src/window/compositor.rs index 2f504ff7..3ad10b59 100644 --- a/glow/src/window/compositor.rs +++ b/glow/src/window/compositor.rs @@ -1,4 +1,4 @@ -use crate::{Backend, Renderer, Settings, Viewport}; +use crate::{Backend, Color, Renderer, Settings, Viewport};  use core::ffi::c_void;  use glow::HasContext; @@ -21,8 +21,6 @@ impl iced_graphics::window::GLCompositor for Compositor {      ) -> (Self, Self::Renderer) {          let gl = glow::Context::from_loader_function(loader_function); -        gl.clear_color(1.0, 1.0, 1.0, 1.0); -          // Enable auto-conversion from/to sRGB          gl.enable(glow::FRAMEBUFFER_SRGB); @@ -60,12 +58,16 @@ impl iced_graphics::window::GLCompositor for Compositor {          &mut self,          renderer: &mut Self::Renderer,          viewport: &Viewport, +        color: Color,          output: &<Self::Renderer as iced_native::Renderer>::Output,          overlay: &[T],      ) -> mouse::Interaction {          let gl = &self.gl; +        let [r, g, b, a] = color.into_linear(); +          unsafe { +            gl.clear_color(r, g, b, a);              gl.clear(glow::COLOR_BUFFER_BIT);          }  | 
