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

Merge branch 'gpui2' into gpui2-ui

Browse source
This commit is contained in:
Marshall Bowers 2023-10-18 10:43:15 -04:00
commit 5491398a64
74 changed files with 2202 additions and 2530 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/gpui3_macros/src/style_helpers.rs
View file

@ -131,7 +131,7 @@ fn generate_predefined_setter(
let method = quote! {
#[doc = #doc_string]
fn #method_name(mut self) -> Self where Self: std::marker::Sized {
let mut style = self.declared_style();
let style = self.style();
#(#field_assignments)*
self
}
@ -164,7 +164,7 @@ fn generate_custom_value_setter(
let method = quote! {
#[doc = #doc_string]
fn #method_name(mut self, length: impl std::clone::Clone + Into<gpui3::#length_type>) -> Self where Self: std::marker::Sized {
let mut style = self.declared_style();
let style = self.style();
#(#field_assignments)*
self
}