mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-26 20:22:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix merge

Browse source
This commit is contained in:
Nathan Sobo 2024-01-01 12:23:42 -07:00
parent bcf0e3fb05
commit f836873764
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
crates/gpui2/src/element.rs
View file

@ -9,7 +9,7 @@ use std::{any::Any, fmt::Debug};
pub trait Element: 'static + IntoElement { pub trait Element: 'static + IntoElement {
type State: 'static; type State: 'static;
fn layout( fn request_layout(
&mut self, &mut self,
state: Option<Self::State>, state: Option<Self::State>,
cx: &mut WindowContext, cx: &mut WindowContext,
@ -167,7 +167,7 @@ impl<C: RenderOnce> Element for Component<C> {
let mut element = self.component.take().unwrap().render(cx).into_element(); let mut element = self.component.take().unwrap().render(cx).into_element();
if let Some(element_id) = element.element_id() { if let Some(element_id) = element.element_id() {
let layout_id = let layout_id =
cx.with_element_state(element_id, |state, cx| element.layout(state, cx)); cx.with_element_state(element_id, |state, cx| element.request_layout(state, cx));
let state = ComponentState { let state = ComponentState {
rendered_element: Some(element), rendered_element: Some(element),
rendered_element_state: None, rendered_element_state: None,
@ -175,7 +175,7 @@ impl<C: RenderOnce> Element for Component<C> {
(layout_id, state) (layout_id, state)
} else { } else {
let (layout_id, state) = let (layout_id, state) =
element.layout(state.and_then(|s| s.rendered_element_state), cx); element.request_layout(state.and_then(|s| s.rendered_element_state), cx);
let state = ComponentState { let state = ComponentState {
rendered_element: Some(element), rendered_element: Some(element),
rendered_element_state: Some(state), rendered_element_state: Some(state),
@ -271,7 +271,7 @@ impl<E: Element> DrawableElement<E> {
self.element.as_ref()?.element_id() self.element.as_ref()?.element_id()
} }
fn layout(&mut self, cx: &mut WindowContext) -> LayoutId { fn request_layout(&mut self, cx: &mut WindowContext) -> LayoutId {
let (layout_id, frame_state) = if let Some(id) = self.element.as_ref().unwrap().element_id() let (layout_id, frame_state) = if let Some(id) = self.element.as_ref().unwrap().element_id()
{ {
let layout_id = cx.with_element_state(id, |element_state, cx| { let layout_id = cx.with_element_state(id, |element_state, cx| {
@ -341,7 +341,7 @@ impl<E: Element> DrawableElement<E> {
cx: &mut WindowContext, cx: &mut WindowContext,
) -> Size<Pixels> { ) -> Size<Pixels> {
if matches!(&self.phase, ElementDrawPhase::Start) { if matches!(&self.phase, ElementDrawPhase::Start) {
self.layout(cx); self.request_layout(cx);
} }
let layout_id = match &mut self.phase { let layout_id = match &mut self.phase {
@ -396,7 +396,7 @@ where
} }
fn layout(&mut self, cx: &mut WindowContext) -> LayoutId { fn layout(&mut self, cx: &mut WindowContext) -> LayoutId {
DrawableElement::layout(self.as_mut().unwrap(), cx) DrawableElement::request_layout(self.as_mut().unwrap(), cx)
} }
fn paint(&mut self, cx: &mut WindowContext) { fn paint(&mut self, cx: &mut WindowContext) {