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

Update gpui3_macros::style_helpers! based on its gpui2 equivalent

Browse source
This commit is contained in:
Marshall Bowers 2023-10-09 12:31:22 -04:00
parent 42e9800bde
commit a7c4ae530d
3 changed files with 187 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/gpui3/src/geometry.rs
View file

@ -1,5 +1,5 @@
use core::fmt::Debug; use core::fmt::Debug;
use derive_more::{Add, AddAssign, Div, Mul, Sub, SubAssign}; use derive_more::{Add, AddAssign, Div, Mul, Neg, Sub, SubAssign};
use refineable::Refineable; use refineable::Refineable;
use std::{ use std::{
cmp, fmt, cmp, fmt,
@ -560,7 +560,7 @@ impl<T: Clone + Debug + Mul<S, Output = T>, S: Clone> MulAssign<S> for Corners<T
impl<T: Clone + Debug + Copy> Copy for Corners<T> {} impl<T: Clone + Debug + Copy> Copy for Corners<T> {}
#[derive(Clone, Copy, Default, Add, AddAssign, Sub, SubAssign, Div, PartialEq, PartialOrd)] #[derive(Clone, Copy, Default, Add, AddAssign, Sub, SubAssign, Div, Neg, PartialEq, PartialOrd)]
#[repr(transparent)] #[repr(transparent)]
pub struct Pixels(pub(crate) f32); pub struct Pixels(pub(crate) f32);
@ -770,7 +770,7 @@ impl From<f64> for GlobalPixels {
} }
} }
#[derive(Clone, Copy, Default, Add, Sub, Mul, Div)] #[derive(Clone, Copy, Default, Add, Sub, Mul, Div, Neg)]
pub struct Rems(f32); pub struct Rems(f32);
impl Mul<Pixels> for Rems { impl Mul<Pixels> for Rems {
@ -787,7 +787,7 @@ impl Debug for Rems {
} }
} }
#[derive(Clone, Copy, Debug)] #[derive(Clone, Copy, Debug, Neg)]
pub enum AbsoluteLength { pub enum AbsoluteLength {
Pixels(Pixels), Pixels(Pixels),
Rems(Rems), Rems(Rems),
@ -830,7 +830,7 @@ impl Default for AbsoluteLength {
} }
/// A non-auto length that can be defined in pixels, rems, or percent of parent. /// A non-auto length that can be defined in pixels, rems, or percent of parent.
#[derive(Clone, Copy)] #[derive(Clone, Copy, Neg)]
pub enum DefiniteLength { pub enum DefiniteLength {
Absolute(AbsoluteLength), Absolute(AbsoluteLength),
/// A fraction of the parent's size between 0 and 1. /// A fraction of the parent's size between 0 and 1.

20
crates/gpui3/src/style_helpers.rs
View file

@ -8,26 +8,6 @@ use smallvec::smallvec;
pub trait StyleHelpers: Sized + Styled<Style = Style> { pub trait StyleHelpers: Sized + Styled<Style = Style> {
gpui3_macros::style_helpers!(); gpui3_macros::style_helpers!();
fn w<L: Into<Length>>(mut self, width: L) -> Self {
self.declared_style().size.width = Some(width.into());
self
}
fn h<L: Into<Length>>(mut self, height: L) -> Self {
self.declared_style().size.height = Some(height.into());
self
}
/// size_{n}: Sets width & height to {n}
///
/// Example:
/// size_1: Sets width & height to 1
fn size(mut self, size: Length) -> Self {
self.declared_style().size.height = Some(size);
self.declared_style().size.width = Some(size);
self
}
fn full(mut self) -> Self { fn full(mut self) -> Self {
self.declared_style().size.width = Some(relative(1.).into()); self.declared_style().size.width = Some(relative(1.).into());
self.declared_style().size.height = Some(relative(1.).into()); self.declared_style().size.height = Some(relative(1.).into());

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

@ -20,6 +20,7 @@ pub fn style_helpers(input: TokenStream) -> TokenStream {
let output = quote! { let output = quote! {
#(#methods)* #(#methods)*
}; };
output.into() output.into()
} }
@ -27,55 +28,139 @@ fn generate_methods() -> Vec<TokenStream2> {
let mut methods = Vec::new(); let mut methods = Vec::new();
for (prefix, auto_allowed, fields) in box_prefixes() { for (prefix, auto_allowed, fields) in box_prefixes() {
for (suffix, length_tokens) in box_suffixes() { methods.push(generate_custom_value_setter(
if auto_allowed || suffix != "auto" { prefix,
let method = generate_method(prefix, suffix, &fields, length_tokens); if auto_allowed {
methods.push(method); quote! { Length }
} else {
quote! { DefiniteLength }
},
&fields,
));
for (suffix, length_tokens, doc_string) in box_suffixes() {
if suffix != "auto" || auto_allowed {
methods.push(generate_predefined_setter(
prefix,
suffix,
&fields,
&length_tokens,
false,
doc_string,
));
}
if suffix != "auto" {
methods.push(generate_predefined_setter(
prefix,
suffix,
&fields,
&length_tokens,
true,
doc_string,
));
} }
} }
} }
for (prefix, fields) in corner_prefixes() { for (prefix, fields) in corner_prefixes() {
for (suffix, radius_tokens) in corner_suffixes() { methods.push(generate_custom_value_setter(
let method = generate_method(prefix, suffix, &fields, radius_tokens); prefix,
methods.push(method); quote! { AbsoluteLength },
&fields,
));
for (suffix, radius_tokens, doc_string) in corner_suffixes() {
methods.push(generate_predefined_setter(
prefix,
suffix,
&fields,
&radius_tokens,
false,
doc_string,
));
} }
} }
for (prefix, fields) in border_prefixes() { for (prefix, fields) in border_prefixes() {
for (suffix, width_tokens) in border_suffixes() { for (suffix, width_tokens, doc_string) in border_suffixes() {
let method = generate_method(prefix, suffix, &fields, width_tokens); methods.push(generate_predefined_setter(
methods.push(method); prefix,
suffix,
&fields,
&width_tokens,
false,
doc_string,
));
} }
} }
methods methods
} }
fn generate_method( fn generate_predefined_setter(
prefix: &'static str, name: &'static str,
suffix: &'static str, length: &'static str,
fields: &Vec<TokenStream2>, fields: &Vec<TokenStream2>,
length_tokens: TokenStream2, length_tokens: &TokenStream2,
negate: bool,
doc_string: &'static str,
) -> TokenStream2 { ) -> TokenStream2 {
let method_name = if suffix.is_empty() { let (negation_prefix, negation_token) = if negate {
format_ident!("{}", prefix) ("neg_", quote! { - })
} else { } else {
format_ident!("{}_{}", prefix, suffix) ("", quote! {})
};
let method_name = if length.is_empty() {
format_ident!("{}{}", negation_prefix, name)
} else {
format_ident!("{}{}_{}", negation_prefix, name, length)
}; };
let field_assignments = fields let field_assignments = fields
.iter() .iter()
.map(|field_tokens| { .map(|field_tokens| {
quote! { quote! {
style.#field_tokens = Some(gpui3::#length_tokens.into()); style.#field_tokens = Some((#negation_token gpui3::#length_tokens).into());
} }
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let method = quote! { let method = quote! {
#[doc = #doc_string]
fn #method_name(mut self) -> Self where Self: std::marker::Sized { fn #method_name(mut self) -> Self where Self: std::marker::Sized {
let style = self.declared_style(); let mut style = self.declared_style();
#(#field_assignments)*
self
}
};
method
}
fn generate_custom_value_setter(
prefix: &'static str,
length_type: TokenStream2,
fields: &Vec<TokenStream2>,
) -> TokenStream2 {
let method_name = format_ident!("{}", prefix);
let mut iter = fields.into_iter();
let last = iter.next_back().unwrap();
let field_assignments = iter
.map(|field_tokens| {
quote! {
style.#field_tokens = Some(length.clone().into());
}
})
.chain(std::iter::once(quote! {
style.#last = Some(length.into());
}))
.collect::<Vec<_>>();
let method = quote! {
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();
#(#field_assignments)* #(#field_assignments)*
self self
} }
@ -93,10 +178,10 @@ fn box_prefixes() -> Vec<(&'static str, bool, Vec<TokenStream2>)> {
true, true,
vec![quote! {size.width}, quote! {size.height}], vec![quote! {size.width}, quote! {size.height}],
), ),
("min_w", false, vec![quote! { min_size.width }]), ("min_w", true, vec![quote! { min_size.width }]),
("min_h", false, vec![quote! { min_size.height }]), ("min_h", true, vec![quote! { min_size.height }]),
("max_w", false, vec![quote! { max_size.width }]), ("max_w", true, vec![quote! { max_size.width }]),
("max_h", false, vec![quote! { max_size.height }]), ("max_h", true, vec![quote! { max_size.height }]),
( (
"m", "m",
true, true,
@ -159,55 +244,52 @@ fn box_prefixes() -> Vec<(&'static str, bool, Vec<TokenStream2>)> {
] ]
} }
fn box_suffixes() -> Vec<(&'static str, TokenStream2)> { fn box_suffixes() -> Vec<(&'static str, TokenStream2, &'static str)> {
vec![ vec![
("0", quote! { px(0.) }), ("0", quote! { px(0.) }, "0px"),
("0p5", quote! { rems(0.125) }), ("0p5", quote! { rems(0.125) }, "2px (0.125rem)"),
("1", quote! { rems(0.25) }), ("1", quote! { rems(0.25) }, "4px (0.25rem)"),
("1p5", quote! { rems(0.375) }), ("1p5", quote! { rems(0.375) }, "6px (0.375rem)"),
("2", quote! { rems(0.5) }), ("2", quote! { rems(0.5) }, "8px (0.5rem)"),
("2p5", quote! { rems(0.625) }), ("2p5", quote! { rems(0.625) }, "10px (0.625rem)"),
("3", quote! { rems(0.75) }), ("3", quote! { rems(0.75) }, "12px (0.75rem)"),
("3p5", quote! { rems(0.875) }), ("3p5", quote! { rems(0.875) }, "14px (0.875rem)"),
("4", quote! { rems(1.) }), ("4", quote! { rems(1.) }, "16px (1rem)"),
("5", quote! { rems(1.25) }), ("5", quote! { rems(1.25) }, "20px (1.25rem)"),
("6", quote! { rems(1.5) }), ("6", quote! { rems(1.5) }, "24px (1.5rem)"),
("7", quote! { rems(1.75) }), ("7", quote! { rems(1.75) }, "28px (1.75rem)"),
("8", quote! { rems(2.0) }), ("8", quote! { rems(2.0) }, "32px (2rem)"),
("9", quote! { rems(2.25) }), ("9", quote! { rems(2.25) }, "36px (2.25rem)"),
("10", quote! { rems(2.5) }), ("10", quote! { rems(2.5) }, "40px (2.5rem)"),
("11", quote! { rems(2.75) }), ("11", quote! { rems(2.75) }, "44px (2.75rem)"),
("12", quote! { rems(3.) }), ("12", quote! { rems(3.) }, "48px (3rem)"),
("16", quote! { rems(4.) }), ("16", quote! { rems(4.) }, "64px (4rem)"),
("20", quote! { rems(5.) }), ("20", quote! { rems(5.) }, "80px (5rem)"),
("24", quote! { rems(6.) }), ("24", quote! { rems(6.) }, "96px (6rem)"),
("32", quote! { rems(8.) }), ("32", quote! { rems(8.) }, "128px (8rem)"),
("40", quote! { rems(10.) }), ("40", quote! { rems(10.) }, "160px (10rem)"),
("48", quote! { rems(12.) }), ("48", quote! { rems(12.) }, "192px (12rem)"),
("56", quote! { rems(14.) }), ("56", quote! { rems(14.) }, "224px (14rem)"),
("64", quote! { rems(16.) }), ("64", quote! { rems(16.) }, "256px (16rem)"),
("72", quote! { rems(18.) }), ("72", quote! { rems(18.) }, "288px (18rem)"),
("80", quote! { rems(20.) }), ("80", quote! { rems(20.) }, "320px (20rem)"),
("96", quote! { rems(24.) }), ("96", quote! { rems(24.) }, "384px (24rem)"),
("auto", quote! { auto() }), ("auto", quote! { auto() }, "Auto"),
("px", quote! { px(1.) }), ("px", quote! { px(1.) }, "1px"),
("full", quote! { relative(1.) }), ("full", quote! { relative(1.) }, "100%"),
("1_2", quote! { relative(0.5) }), ("1_2", quote! { relative(0.5) }, "50% (1/2)"),
("1_3", quote! { relative(1./3.) }), ("1_3", quote! { relative(1./3.) }, "33% (1/3)"),
("2_3", quote! { relative(2./3.) }), ("2_3", quote! { relative(2./3.) }, "66% (2/3)"),
("1_4", quote! { relative(0.25) }), ("1_4", quote! { relative(0.25) }, "25% (1/4)"),
("2_4", quote! { relative(0.5) }), ("2_4", quote! { relative(0.5) }, "50% (2/4)"),
("3_4", quote! { relative(0.75) }), ("3_4", quote! { relative(0.75) }, "75% (3/4)"),
("1_5", quote! { relative(0.2) }), ("1_5", quote! { relative(0.2) }, "20% (1/5)"),
("2_5", quote! { relative(0.4) }), ("2_5", quote! { relative(0.4) }, "40% (2/5)"),
("3_5", quote! { relative(0.6) }), ("3_5", quote! { relative(0.6) }, "60% (3/5)"),
("4_5", quote! { relative(0.8) }), ("4_5", quote! { relative(0.8) }, "80% (4/5)"),
("1_6", quote! { relative(1./6.) }), ("1_6", quote! { relative(1./6.) }, "16% (1/6)"),
("5_6", quote! { relative(5./6.) }), ("5_6", quote! { relative(5./6.) }, "80% (5/6)"),
("1_12", quote! { relative(1./12.) }), ("1_12", quote! { relative(1./12.) }, "8% (1/12)"),
// ("screen_50", quote! { DefiniteLength::Vh(50.0) }),
// ("screen_75", quote! { DefiniteLength::Vh(75.0) }),
// ("screen", quote! { DefiniteLength::Vh(100.0) }),
] ]
} }
@ -257,16 +339,16 @@ fn corner_prefixes() -> Vec<(&'static str, Vec<TokenStream2>)> {
] ]
} }
fn corner_suffixes() -> Vec<(&'static str, TokenStream2)> { fn corner_suffixes() -> Vec<(&'static str, TokenStream2, &'static str)> {
vec![ vec![
("none", quote! { px(0.) }), ("none", quote! { px(0.) }, "0px"),
("sm", quote! { rems(0.125) }), ("sm", quote! { rems(0.125) }, "2px (0.125rem)"),
("md", quote! { rems(0.25) }), ("md", quote! { rems(0.25) }, "4px (0.25rem)"),
("lg", quote! { rems(0.5) }), ("lg", quote! { rems(0.5) }, "8px (0.5rem)"),
("xl", quote! { rems(0.75) }), ("xl", quote! { rems(0.75) }, "12px (0.75rem)"),
("2xl", quote! { rems(1.) }), ("2xl", quote! { rems(1.) }, "16px (1rem)"),
("3xl", quote! { rems(1.5) }), ("3xl", quote! { rems(1.5) }, "24px (1.5rem)"),
("full", quote! { px(9999.) }), ("full", quote! { px(9999.) }, "9999px"),
] ]
} }
@ -302,25 +384,25 @@ fn border_prefixes() -> Vec<(&'static str, Vec<TokenStream2>)> {
] ]
} }
fn border_suffixes() -> Vec<(&'static str, TokenStream2)> { fn border_suffixes() -> Vec<(&'static str, TokenStream2, &'static str)> {
vec![ vec![
("", quote! { px(1.) }), ("", quote! { px(1.)}, "1px"),
("0", quote! { px(0.) }), ("0", quote! { px(0.)}, "0px"),
("1", quote! { px(1.) }), ("1", quote! { px(1.) }, "1px"),
("2", quote! { px(2.) }), ("2", quote! { px(2.) }, "2px"),
("3", quote! { px(3.) }), ("3", quote! { px(3.) }, "3px"),
("4", quote! { px(4.) }), ("4", quote! { px(4.) }, "4px"),
("5", quote! { px(5.) }), ("5", quote! { px(5.) }, "5px"),
("6", quote! { px(6.) }), ("6", quote! { px(6.) }, "6px"),
("7", quote! { px(7.) }), ("7", quote! { px(7.) }, "7px"),
("8", quote! { px(8.) }), ("8", quote! { px(8.) }, "8px"),
("9", quote! { px(9.) }), ("9", quote! { px(9.) }, "9px"),
("10", quote! { px(10.) }), ("10", quote! { px(10.) }, "10px"),
("11", quote! { px(11.) }), ("11", quote! { px(11.) }, "11px"),
("12", quote! { px(12.) }), ("12", quote! { px(12.) }, "12px"),
("16", quote! { px(16.) }), ("16", quote! { px(16.) }, "16px"),
("20", quote! { px(20.) }), ("20", quote! { px(20.) }, "20px"),
("24", quote! { px(24.) }), ("24", quote! { px(24.) }, "24px"),
("32", quote! { px(32.) }), ("32", quote! { px(32.) }, "32px"),
] ]
} }