Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix erorr in revert

Browse source
This commit is contained in:
Mikayla 2023-08-18 17:59:06 -07:00
parent 48553d7c8f
commit d22caf5a19
No known key found for this signature in database
1 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

39
crates/gpui/src/elements/component.rs
View file

@ -105,22 +105,24 @@ impl<V: View> Component<V> for ElementAdapter<V> {
} }
// Component -> Element // Component -> Element
pub struct ComponentAdapter<V, E> { pub struct ComponentAdapter<V: View, E> {
component: Option<E>, component: Option<E>,
element: Option<AnyElement<V>>,
phantom: PhantomData<V>, phantom: PhantomData<V>,
} }
impl<E, V> ComponentAdapter<V, E> { impl<E, V: View> ComponentAdapter<V, E> {
pub fn new(e: E) -> Self { pub fn new(e: E) -> Self {
Self { Self {
component: Some(e), component: Some(e),
element: None,
phantom: PhantomData, phantom: PhantomData,
} }
} }
} }
impl<V: View, C: Component<V> + 'static> Element<V> for ComponentAdapter<V, C> { impl<V: View, C: Component<V> + 'static> Element<V> for ComponentAdapter<V, C> {
type LayoutState = AnyElement<V>; type LayoutState = ();
type PaintState = (); type PaintState = ();
@ -130,10 +132,16 @@ impl<V: View, C: Component<V> + 'static> Element<V> for ComponentAdapter<V, C> {
view: &mut V, view: &mut V,
cx: &mut LayoutContext<V>, cx: &mut LayoutContext<V>,
) -> (Vector2F, Self::LayoutState) { ) -> (Vector2F, Self::LayoutState) {
let component = self.component.take().unwrap(); if self.element.is_none() {
let mut element = component.render(view, cx.view_context()); let element = self
let constraint = element.layout(constraint, view, cx); .component
(constraint, element) .take()
.expect("Component can only be rendered once")
.render(view, cx.view_context());
self.element = Some(element);
}
let constraint = self.element.as_mut().unwrap().layout(constraint, view, cx);
(constraint, ())
} }
fn paint( fn paint(
@ -141,11 +149,14 @@ impl<V: View, C: Component<V> + 'static> Element<V> for ComponentAdapter<V, C> {
scene: &mut SceneBuilder, scene: &mut SceneBuilder,
bounds: RectF, bounds: RectF,
visible_bounds: RectF, visible_bounds: RectF,
layout: &mut Self::LayoutState, _: &mut Self::LayoutState,
view: &mut V, view: &mut V,
cx: &mut PaintContext<V>, cx: &mut PaintContext<V>,
) -> Self::PaintState { ) -> Self::PaintState {
layout.paint(scene, bounds.origin(), visible_bounds, view, cx) self.element
.as_mut()
.expect("Layout should always be called before paint")
.paint(scene, bounds.origin(), visible_bounds, view, cx)
} }
fn rect_for_text_range( fn rect_for_text_range(
@ -153,25 +164,27 @@ impl<V: View, C: Component<V> + 'static> Element<V> for ComponentAdapter<V, C> {
range_utf16: std::ops::Range<usize>, range_utf16: std::ops::Range<usize>,
_: RectF, _: RectF,
_: RectF, _: RectF,
element: &Self::LayoutState, _: &Self::LayoutState,
_: &Self::PaintState, _: &Self::PaintState,
view: &V, view: &V,
cx: &ViewContext<V>, cx: &ViewContext<V>,
) -> Option<RectF> { ) -> Option<RectF> {
element.rect_for_text_range(range_utf16, view, cx) self.element
.as_ref()
.and_then(|el| el.rect_for_text_range(range_utf16, view, cx))
} }
fn debug( fn debug(
&self, &self,
_: RectF, _: RectF,
element: &Self::LayoutState, _: &Self::LayoutState,
_: &Self::PaintState, _: &Self::PaintState,
view: &V, view: &V,
cx: &ViewContext<V>, cx: &ViewContext<V>,
) -> serde_json::Value { ) -> serde_json::Value {
serde_json::json!({ serde_json::json!({
"type": "ComponentAdapter", "type": "ComponentAdapter",
"child": element.debug(view, cx), "child": self.element.as_ref().map(|el| el.debug(view, cx)),
}) })
} }
} }