me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use Borrow<T> when binding in layer::Cache<T>

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2020-04-19 17:59:32 +02:00
parent 8ade09a0f6
commit a97acd8fa8
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
wgpu/src/widget/canvas/layer/cache.rs
View file

@ -4,7 +4,7 @@ use crate::{
}; };
use iced_native::Size; use iced_native::Size;
use std::{cell::RefCell, marker::PhantomData, sync::Arc}; use std::{borrow::Borrow, cell::RefCell, marker::PhantomData, sync::Arc};
enum State { enum State {
Empty, Empty,
@ -71,7 +71,10 @@ where
/// [`Cache`]: struct.Cache.html /// [`Cache`]: struct.Cache.html
/// [`Layer`]: ../trait.Layer.html /// [`Layer`]: ../trait.Layer.html
/// [`Canvas`]: ../../struct.Canvas.html /// [`Canvas`]: ../../struct.Canvas.html
pub fn with<'a>(&'a self, input: &'a T) -> impl Layer + 'a { pub fn with<'a>(
&'a self,
input: impl Borrow<T> + std::fmt::Debug + 'a,
) -> impl Layer + 'a {
Bind { Bind {
cache: self, cache: self,
input: input, input: input,
@ -94,14 +97,15 @@ where
} }
#[derive(Debug)] #[derive(Debug)]
struct Bind<'a, T: Drawable> { struct Bind<'a, T: Drawable, I: Borrow<T> + 'a> {
cache: &'a Cache<T>, cache: &'a Cache<T>,
input: &'a T, input: I,
} }
impl<'a, T> Layer for Bind<'a, T> impl<'a, T, I> Layer for Bind<'a, T, I>
where where
T: Drawable + std::fmt::Debug, T: Drawable + std::fmt::Debug,
I: Borrow<T> + std::fmt::Debug + 'a,
{ {
fn draw(&self, current_bounds: Size) -> Arc<Primitive> { fn draw(&self, current_bounds: Size) -> Arc<Primitive> {
use std::ops::Deref; use std::ops::Deref;
@ -115,7 +119,7 @@ where
} }
let mut frame = Frame::new(current_bounds.width, current_bounds.height); let mut frame = Frame::new(current_bounds.width, current_bounds.height);
self.input.draw(&mut frame); self.input.borrow().draw(&mut frame);
let primitive = Arc::new(frame.into_primitive()); let primitive = Arc::new(frame.into_primitive());