mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-18 08:02:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Checkpoint

Browse source
This commit is contained in:
Antonio Scandurra 2023-10-17 11:20:11 +02:00
parent fb1e7eef6b
commit bb348c1353
1 changed files with 37 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
crates/gpui3/src/elements/nested.rs
View file

@ -1,7 +1,7 @@
use crate::{ use crate::{
group_bounds, AnyElement, DispatchPhase, Element, ElementId, IdentifiedElement, IntoAnyElement, group_bounds, AnyElement, BorrowWindow, DispatchPhase, Element, ElementId, IdentifiedElement,
MouseDownEvent, MouseMoveEvent, MouseUpEvent, SharedString, Style, StyleCascade, IntoAnyElement, MouseDownEvent, MouseMoveEvent, MouseUpEvent, SharedString, Style,
StyleRefinement, ViewContext, StyleCascade, StyleRefinement, ViewContext,
}; };
use parking_lot::Mutex; use parking_lot::Mutex;
use refineable::{CascadeSlot, Refineable}; use refineable::{CascadeSlot, Refineable};
@ -72,6 +72,20 @@ impl<V: 'static + Send + Sync> LayoutNodeElement<V, Anonymous> {
} }
} }
impl<V: 'static + Send + Sync, E: ElementKind> LayoutNodeElement<V, E> {
fn with_element_id<R>(
&mut self,
cx: &mut ViewContext<V>,
f: impl FnOnce(&mut Self, &mut ViewContext<V>) -> R,
) -> R {
if let Some(id) = self.id() {
cx.with_element_id(id, |cx| f(self, cx))
} else {
f(self, cx)
}
}
}
impl<V: 'static + Send + Sync, K: ElementKind> Styled for LayoutNodeElement<V, K> { impl<V: 'static + Send + Sync, K: ElementKind> Styled for LayoutNodeElement<V, K> {
fn style_cascade(&mut self) -> &mut StyleCascade { fn style_cascade(&mut self) -> &mut StyleCascade {
&mut self.style_cascade &mut self.style_cascade
@ -84,7 +98,7 @@ impl<V: 'static + Send + Sync, K: ElementKind> Styled for LayoutNodeElement<V, K
} }
impl<V: 'static + Send + Sync> IdentifiedElement for LayoutNodeElement<V, Identified> { impl<V: 'static + Send + Sync> IdentifiedElement for LayoutNodeElement<V, Identified> {
fn element_id(&self) -> crate::ElementId { fn element_id(&self) -> ElementId {
self.kind.0.clone() self.kind.0.clone()
} }
} }
@ -103,8 +117,8 @@ impl<V: 'static + Send + Sync, K: ElementKind> Element for LayoutNodeElement<V,
type ViewState = V; type ViewState = V;
type ElementState = (); type ElementState = ();
fn id(&self) -> Option<crate::ElementId> { fn id(&self) -> Option<ElementId> {
None self.kind.id()
} }
fn layout( fn layout(
@ -113,16 +127,17 @@ impl<V: 'static + Send + Sync, K: ElementKind> Element for LayoutNodeElement<V,
_: Option<Self::ElementState>, _: Option<Self::ElementState>,
cx: &mut crate::ViewContext<Self::ViewState>, cx: &mut crate::ViewContext<Self::ViewState>,
) -> (crate::LayoutId, Self::ElementState) { ) -> (crate::LayoutId, Self::ElementState) {
let layout_ids = self self.with_element_id(cx, |this, cx| {
.children let layout_ids = this
.iter_mut() .children
.map(|child| child.layout(state, cx)) .iter_mut()
.collect::<Vec<_>>(); .map(|child| child.layout(state, cx))
.collect::<Vec<_>>();
// todo!("pass just the style cascade") let style = this.computed_style().clone();
let style = self.computed_style().clone(); let layout_id = cx.request_layout(style, layout_ids);
let layout_id = cx.request_layout(style, layout_ids); (layout_id, ())
(layout_id, ()) })
} }
fn paint( fn paint(
@ -132,9 +147,11 @@ impl<V: 'static + Send + Sync, K: ElementKind> Element for LayoutNodeElement<V,
_: &mut Self::ElementState, _: &mut Self::ElementState,
cx: &mut crate::ViewContext<Self::ViewState>, cx: &mut crate::ViewContext<Self::ViewState>,
) { ) {
for child in &mut self.children { self.with_element_id(cx, |this, cx| {
child.paint(state, None, cx); for child in &mut this.children {
} child.paint(state, None, cx);
}
})
} }
} }
@ -198,7 +215,7 @@ where
type ViewState = E::ViewState; type ViewState = E::ViewState;
type ElementState = E::ElementState; type ElementState = E::ElementState;
fn id(&self) -> Option<crate::ElementId> { fn id(&self) -> Option<ElementId> {
self.child.id() self.child.id()
} }
@ -331,7 +348,7 @@ where
type ViewState = E::ViewState; type ViewState = E::ViewState;
type ElementState = ClickableElementState<E::ElementState>; type ElementState = ClickableElementState<E::ElementState>;
fn id(&self) -> Option<crate::ElementId> { fn id(&self) -> Option<ElementId> {
self.child.id() self.child.id()
} }