diff options
| author |  Héctor Ramón <hector0193@gmail.com> | 2020-06-14 18:10:14 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2020-06-14 18:10:14 +0200 |
| commit | 50c37ff3d7f0cafb203d659b9c4bebf8f11d9b9d (patch) | |
| tree | 6cb1e2cfa8e2933b8edf4cc05e9fb60724903904 /wgpu | |
| parent | f131969c47bb4a32d60d5be4c2bece0688b0a418 (diff) | |
| parent | 4c0286e8acdf0792a9680f6f8212a534a51e3da0 (diff) | |
| download | iced-50c37ff3d7f0cafb203d659b9c4bebf8f11d9b9d.tar.gz iced-50c37ff3d7f0cafb203d659b9c4bebf8f11d9b9d.tar.bz2 iced-50c37ff3d7f0cafb203d659b9c4bebf8f11d9b9d.zip | |
Merge pull request #406 from hecrj/feature/background-color
Add `background_color` to `Application` and `Sandbox`
Diffstat (limited to 'wgpu')
| -rw-r--r-- | wgpu/src/lib.rs | 2 | ||||
| -rw-r--r-- | wgpu/src/window/compositor.rs | 17 |
2 files changed, 12 insertions, 7 deletions
diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs index e67221c7..e51a225c 100644 --- a/wgpu/src/lib.rs +++ b/wgpu/src/lib.rs @@ -36,7 +36,7 @@ mod backend; mod quad; mod text; -pub use iced_graphics::{Antialiasing, Defaults, Primitive, Viewport}; +pub use iced_graphics::{Antialiasing, Color, Defaults, Primitive, Viewport}; pub use wgpu; pub use backend::Backend; diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs index 8345679a..5bdd34bc 100644 --- a/wgpu/src/window/compositor.rs +++ b/wgpu/src/window/compositor.rs @@ -1,4 +1,4 @@ -use crate::{Backend, Renderer, Settings}; +use crate::{Backend, Color, Renderer, Settings}; use iced_graphics::Viewport; use iced_native::{futures, mouse}; @@ -103,6 +103,7 @@ impl iced_graphics::window::Compositor for Compositor { renderer: &mut Self::Renderer, swap_chain: &mut Self::SwapChain, viewport: &Viewport, + background_color: Color, output: &<Self::Renderer as iced_native::Renderer>::Output, overlay: &[T], ) -> mouse::Interaction { @@ -118,11 +119,15 @@ impl iced_graphics::window::Compositor for Compositor { resolve_target: None, load_op: wgpu::LoadOp::Clear, store_op: wgpu::StoreOp::Store, - clear_color: wgpu::Color { - r: 1.0, - g: 1.0, - b: 1.0, - a: 1.0, + clear_color: { + let [r, g, b, a] = background_color.into_linear(); + + wgpu::Color { + r: f64::from(r), + g: f64::from(g), + b: f64::from(b), + a: f64::from(a), + } }, }], depth_stencil_attachment: None, |