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

Checkpoint: Compiling

Browse source
This commit is contained in:
Marshall Bowers 2023-10-26 10:08:39 +02:00
parent 8b972f6d8e
commit 9fb9885931
50 changed files with 139 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

15
crates/gpui2_macros/src/derive_element.rs
View file

@ -47,10 +47,9 @@ pub fn derive_element(input: TokenStream) -> TokenStream {
}
}
impl #impl_generics gpui2::Element for #type_name #ty_generics
impl #impl_generics gpui2::Element<#state_type> for #type_name #ty_generics
#where_clause
{
type ViewState = #state_type;
type ElementState = gpui2::AnyElement<#state_type>;
fn id(&self) -> Option<gpui2::ElementId> {
@ -59,9 +58,9 @@ pub fn derive_element(input: TokenStream) -> TokenStream {
fn initialize(
&mut self,
view_state: &mut Self::ViewState,
view_state: &mut #state_type,
_: Option<Self::ElementState>,
cx: &mut gpui2::ViewContext<Self::ViewState>
cx: &mut gpui2::ViewContext<#state_type>
) -> Self::ElementState {
use gpui2::IntoAnyElement;
@ -72,9 +71,9 @@ pub fn derive_element(input: TokenStream) -> TokenStream {
fn layout(
&mut self,
view_state: &mut Self::ViewState,
view_state: &mut #state_type,
rendered_element: &mut Self::ElementState,
cx: &mut gpui2::ViewContext<Self::ViewState>,
cx: &mut gpui2::ViewContext<#state_type>,
) -> gpui2::LayoutId {
rendered_element.layout(view_state, cx)
}
@ -82,9 +81,9 @@ pub fn derive_element(input: TokenStream) -> TokenStream {
fn paint(
&mut self,
bounds: gpui2::Bounds<gpui2::Pixels>,
view_state: &mut Self::ViewState,
view_state: &mut #state_type,
rendered_element: &mut Self::ElementState,
cx: &mut gpui2::ViewContext<Self::ViewState>,
cx: &mut gpui2::ViewContext<#state_type>,
) {
rendered_element.paint(view_state, cx)
}