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

Add derive macro now new elements

Browse source
This commit is contained in:
Nathan Sobo 2023-08-15 21:04:48 -06:00
parent 77bc682a69
commit 4efc46c763
4 changed files with 129 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

59
crates/gpui/playground/src/components.rs
View file

@ -1,9 +1,10 @@
use crate::{
element::{AnyElement, Element, ElementMetadata},
element::{Element, ElementMetadata},
frame,
themes::rose_pine,
};
use gpui::ViewContext;
use playground_macros::Element;
use std::{borrow::Cow, marker::PhantomData, rc::Rc};
struct ButtonHandlers<V, D> {
@ -16,6 +17,8 @@ impl<V, D> Default for ButtonHandlers<V, D> {
}
}
#[derive(Element)]
#[element_crate = "crate"]
pub struct Button<V: 'static, D: 'static> {
metadata: ElementMetadata<V>,
handlers: ButtonHandlers<V, D>,
@ -89,34 +92,34 @@ impl<V: 'static, D: 'static> Button<V, D> {
}
}
impl<V: 'static, D> Element<V> for Button<V, D> {
type Layout = AnyElement<V>;
// impl<V: 'static, D> Element<V> for Button<V, D> {
// type Layout = AnyElement<V>;
fn style_mut(&mut self) -> &mut crate::style::ElementStyle {
&mut self.metadata.style
}
// fn style_mut(&mut self) -> &mut crate::style::ElementStyle {
// &mut self.metadata.style
// }
fn handlers_mut(&mut self) -> &mut crate::element::ElementHandlers<V> {
&mut self.metadata.handlers
}
// fn handlers_mut(&mut self) -> &mut crate::element::ElementHandlers<V> {
// &mut self.metadata.handlers
// }
fn layout(
&mut self,
view: &mut V,
cx: &mut crate::element::LayoutContext<V>,
) -> anyhow::Result<(taffy::tree::NodeId, Self::Layout)> {
let mut element = self.render(view, cx).into_any();
let node_id = element.layout(view, cx)?;
Ok((node_id, element))
}
// fn layout(
// &mut self,
// view: &mut V,
// cx: &mut crate::element::LayoutContext<V>,
// ) -> anyhow::Result<(taffy::tree::NodeId, Self::Layout)> {
// let mut element = self.render(view, cx).into_any();
// let node_id = element.layout(view, cx)?;
// Ok((node_id, element))
// }
fn paint<'a>(
&mut self,
layout: crate::element::Layout<'a, Self::Layout>,
view: &mut V,
cx: &mut crate::element::PaintContext<V>,
) -> anyhow::Result<()> {
layout.from_element.paint(view, cx)?;
Ok(())
}
}
// fn paint<'a>(
// &mut self,
// layout: crate::element::Layout<'a, Self::Layout>,
// view: &mut V,
// cx: &mut crate::element::PaintContext<V>,
// ) -> anyhow::Result<()> {
// layout.from_element.paint(view, cx)?;
// Ok(())
// }
// }

1
crates/gpui/playground/src/playground.rs
View file

@ -42,7 +42,6 @@ fn main() {
}
fn workspace<V: 'static>(theme: &ThemeColors) -> impl Element<V> {
// frame().w_full().h_half().fill(theme.success(0.5))
frame()
.h_full()
.w(percent(50.))