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

Make Renderer immutable in UserInterface::build

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2019-10-11 23:45:01 +02:00
parent a031a6f213
commit c63bdacaad
3 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
native/src/element.rs
View file

@ -247,10 +247,7 @@ where
} }
} }
pub(crate) fn compute_layout( pub(crate) fn compute_layout(&self, renderer: &Renderer) -> result::Layout {
&self,
renderer: &mut Renderer,
) -> result::Layout {
let node = self.widget.node(renderer); let node = self.widget.node(renderer);
node.0.compute_layout(geometry::Size::undefined()).unwrap() node.0.compute_layout(geometry::Size::undefined()).unwrap()

2
native/src/user_interface.rs
View file

@ -98,7 +98,7 @@ where
pub fn build<E: Into<Element<'a, Message, Renderer>>>( pub fn build<E: Into<Element<'a, Message, Renderer>>>(
root: E, root: E,
cache: Cache, cache: Cache,
renderer: &mut Renderer, renderer: &Renderer,
) -> Self { ) -> Self {
let root = root.into(); let root = root.into();

6
winit/src/application.rs
View file

@ -41,7 +41,7 @@ pub trait Application {
let user_interface = UserInterface::build( let user_interface = UserInterface::build(
document(&mut self, size), document(&mut self, size),
Cache::default(), Cache::default(),
&mut renderer, &renderer,
); );
let mut primitive = user_interface.draw(&mut renderer); let mut primitive = user_interface.draw(&mut renderer);
@ -61,7 +61,7 @@ pub trait Application {
let mut user_interface = UserInterface::build( let mut user_interface = UserInterface::build(
document(&mut self, size), document(&mut self, size),
cache.take().unwrap(), cache.take().unwrap(),
&mut renderer, &renderer,
); );
let messages = user_interface.update(events.drain(..)); let messages = user_interface.update(events.drain(..));
@ -84,7 +84,7 @@ pub trait Application {
let user_interface = UserInterface::build( let user_interface = UserInterface::build(
document(&mut self, size), document(&mut self, size),
temp_cache, temp_cache,
&mut renderer, &renderer,
); );
primitive = user_interface.draw(&mut renderer); primitive = user_interface.draw(&mut renderer);