diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2022-11-03 05:09:07 +0100 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2022-11-03 05:09:07 +0100 |
| commit | 921c94162e50b09604fafeeb319c4a424d64be0e (patch) | |
| tree | eff2e63d6cbef2732bd9f29c5733181191ef0a12 /graphics | |
| parent | 93e309f491a8941bafb919e75d660e65071475f4 (diff) | |
| parent | 231d2fd8454eb9d24ba970131d4d7339cc0c8d51 (diff) | |
| download | iced-921c94162e50b09604fafeeb319c4a424d64be0e.tar.gz iced-921c94162e50b09604fafeeb319c4a424d64be0e.tar.bz2 iced-921c94162e50b09604fafeeb319c4a424d64be0e.zip | |
Merge branch 'master' into fear/linear-gradients
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/Cargo.toml | 2 | ||||
| -rw-r--r-- | graphics/src/window/compositor.rs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/graphics/Cargo.toml b/graphics/Cargo.toml index ff6fcd4a..3b0e5236 100644 --- a/graphics/Cargo.toml +++ b/graphics/Cargo.toml @@ -20,7 +20,7 @@ opengl = [] [dependencies] glam = "0.21.3" -raw-window-handle = "0.4" +raw-window-handle = "0.5" thiserror = "1.0" [dependencies.bytemuck] diff --git a/graphics/src/window/compositor.rs b/graphics/src/window/compositor.rs index 0c4cadcd..52255666 100644 --- a/graphics/src/window/compositor.rs +++ b/graphics/src/window/compositor.rs @@ -2,7 +2,7 @@ //! surfaces. use crate::{Color, Error, Viewport}; -use raw_window_handle::HasRawWindowHandle; +use raw_window_handle::{HasRawDisplayHandle, HasRawWindowHandle}; use thiserror::Error; /// A graphics compositor that can draw to windows. @@ -17,7 +17,7 @@ pub trait Compositor: Sized { type Surface; /// Creates a new [`Compositor`]. - fn new<W: HasRawWindowHandle>( + fn new<W: HasRawWindowHandle + HasRawDisplayHandle>( settings: Self::Settings, compatible_window: Option<&W>, ) -> Result<(Self, Self::Renderer), Error>; @@ -25,7 +25,7 @@ pub trait Compositor: Sized { /// Crates a new [`Surface`] for the given window. /// /// [`Surface`]: Self::Surface - fn create_surface<W: HasRawWindowHandle>( + fn create_surface<W: HasRawWindowHandle + HasRawDisplayHandle>( &mut self, window: &W, ) -> Self::Surface; |