From 917a80ec360f796e145e3fbf66f0646bfa686708 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Mon, 30 Aug 2021 17:24:51 +0200 Subject: [PATCH] :art: Co-Authored-By: Nathan Sobo --- gpui/src/app.rs | 2 +- gpui/src/elements/list.rs | 8 ++++---- gpui/src/presenter.rs | 7 +++++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/gpui/src/app.rs b/gpui/src/app.rs index 69591d8052fbad135ce5e226f2a98ace744ab963..c15268c102287396325323855a69b97f8e7e68fa 100644 --- a/gpui/src/app.rs +++ b/gpui/src/app.rs @@ -1248,7 +1248,7 @@ impl MutableAppContext { ) } - pub fn render_cx( + pub fn build_render_context( &mut self, window_id: usize, view_id: usize, diff --git a/gpui/src/elements/list.rs b/gpui/src/elements/list.rs index c7950482c379e0fdfc90e9fa93cd5980ab976197..bfbb6a7b737e9a70364d9d3507e74091590d6d11 100644 --- a/gpui/src/elements/list.rs +++ b/gpui/src/elements/list.rs @@ -440,13 +440,13 @@ mod tests { let mut list = List::new( state.clone(), - &cx.render_cx::(0, 0, 0., false), + &cx.build_render_context::(0, 0, 0., false), |range| elements[range].iter().copied().map(item), ) .boxed(); let size = list.layout( SizeConstraint::new(vec2f(0., 0.), vec2f(100., 40.)), - &mut presenter.layout_cx(cx), + &mut presenter.build_layout_context(cx), ); assert_eq!(size, vec2f(100., 40.)); assert_eq!( @@ -473,13 +473,13 @@ mod tests { let mut list = List::new( state.clone(), - &cx.render_cx::(0, 0, 0., false), + &cx.build_render_context::(0, 0, 0., false), |range| elements[range].iter().copied().map(item), ) .boxed(); let size = list.layout( SizeConstraint::new(vec2f(0., 0.), vec2f(100., 40.)), - &mut presenter.layout_cx(cx), + &mut presenter.build_layout_context(cx), ); assert_eq!(size, vec2f(100., 40.)); assert_eq!( diff --git a/gpui/src/presenter.rs b/gpui/src/presenter.rs index c2c670f1e706a010f452b2e7fec6277e5497030a..31c91688dbc4957299a5fcc5dbe41b3673d22d2d 100644 --- a/gpui/src/presenter.rs +++ b/gpui/src/presenter.rs @@ -124,12 +124,15 @@ impl Presenter { fn layout(&mut self, size: Vector2F, cx: &mut MutableAppContext) { if let Some(root_view_id) = cx.root_view_id(self.window_id) { - self.layout_cx(cx) + self.build_layout_context(cx) .layout(root_view_id, SizeConstraint::strict(size)); } } - pub fn layout_cx<'a>(&'a mut self, cx: &'a mut MutableAppContext) -> LayoutContext<'a> { + pub fn build_layout_context<'a>( + &'a mut self, + cx: &'a mut MutableAppContext, + ) -> LayoutContext<'a> { LayoutContext { rendered_views: &mut self.rendered_views, parents: &mut self.parents,