diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-09-08 00:35:17 +0200 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-09-08 00:44:59 +0200 |
| commit | c1f79b40cf704cafc807250b177fc7d3444fe54f (patch) | |
| tree | 31c0cf2b8d166976dc819f020e0185f9d8c2bdcd /glow | |
| parent | faa12382d4d7a44ab60fa5bf2a5024a34dbb2e8d (diff) | |
| download | iced-c1f79b40cf704cafc807250b177fc7d3444fe54f.tar.gz iced-c1f79b40cf704cafc807250b177fc7d3444fe54f.tar.bz2 iced-c1f79b40cf704cafc807250b177fc7d3444fe54f.zip | |
Make `Application` and `Sandbox` return a `Result`
Diffstat (limited to 'glow')
| -rw-r--r-- | glow/src/lib.rs | 2 | ||||
| -rw-r--r-- | glow/src/window/compositor.rs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/glow/src/lib.rs b/glow/src/lib.rs index a6c8a75a..5011da8e 100644 --- a/glow/src/lib.rs +++ b/glow/src/lib.rs @@ -26,7 +26,7 @@ pub(crate) use iced_graphics::Transformation; #[doc(no_inline)] pub use widget::*; -pub use iced_graphics::Viewport; +pub use iced_graphics::{Error, Viewport}; pub use iced_native::{ Background, Color, Command, HorizontalAlignment, Length, Vector, VerticalAlignment, diff --git a/glow/src/window/compositor.rs b/glow/src/window/compositor.rs index 3ad10b59..1fb671ad 100644 --- a/glow/src/window/compositor.rs +++ b/glow/src/window/compositor.rs @@ -1,4 +1,4 @@ -use crate::{Backend, Color, Renderer, Settings, Viewport}; +use crate::{Backend, Color, Error, Renderer, Settings, Viewport}; use core::ffi::c_void; use glow::HasContext; @@ -18,7 +18,7 @@ impl iced_graphics::window::GLCompositor for Compositor { unsafe fn new( settings: Self::Settings, loader_function: impl FnMut(&str) -> *const c_void, - ) -> (Self, Self::Renderer) { + ) -> Result<(Self, Self::Renderer), Error> { let gl = glow::Context::from_loader_function(loader_function); // Enable auto-conversion from/to sRGB @@ -33,7 +33,7 @@ impl iced_graphics::window::GLCompositor for Compositor { let renderer = Renderer::new(Backend::new(&gl, settings)); - (Self { gl }, renderer) + Ok((Self { gl }, renderer)) } fn sample_count(settings: &Settings) -> u32 { |