Nate Butler
94d8ead270
Density tracking issue: #18078 This PR refactors our spacing system to use a more flexible and maintainable approach. We've replaced the static `Spacing` enum with a dynamically generated `DynamicSpacing` enum using a proc macro. Enum variants now use a `BaseXX` format, where XX = the pixel value @ default rem size and the default UI density. For example: `CustomSpacing::Base16` would return 16px at the default UI scale & density. I'd love to find another name other than `Base` that is clear (to avoid base_10, etc confusion), let me know if you have any ideas! Changes: - Introduced a new `derive_dynamic_spacing` proc macro to generate the `DynamicSpacing` enum - Updated all usages of `Spacing` to use the new `DynamicSpacing` - Removed the `custom_spacing` function, mapping previous usages to appropriate `DynamicSpacing` variants - Improved documentation and type safety for spacing values New usage example: ```rust .child( div() .flex() .flex_none() .m(DynamicSpacing::Base04.px(cx)) .size(DynamicSpacing::Base16.rems(cx)) .children(icon), ) ``` vs old usage example: ``` .child( div() .flex() .flex_none() .m(Spacing::Small.px(cx)) .size(custom_spacing(px(16.))) .children(icon), ) ``` Release Notes: - N/A
64 lines
1.9 KiB
Rust
64 lines
1.9 KiB
Rust
#![allow(missing_docs)]
|
|
|
|
use std::sync::Arc;
|
|
|
|
use crate::prelude::*;
|
|
|
|
/// A [`Checkbox`] that has a [`Label`].
|
|
#[derive(IntoElement)]
|
|
pub struct RadioWithLabel {
|
|
id: ElementId,
|
|
label: Label,
|
|
selected: bool,
|
|
on_click: Arc<dyn Fn(&bool, &mut WindowContext) + 'static>,
|
|
}
|
|
|
|
impl RadioWithLabel {
|
|
pub fn new(
|
|
id: impl Into<ElementId>,
|
|
label: Label,
|
|
selected: bool,
|
|
on_click: impl Fn(&bool, &mut WindowContext) + 'static,
|
|
) -> Self {
|
|
Self {
|
|
id: id.into(),
|
|
label,
|
|
selected,
|
|
on_click: Arc::new(on_click),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl RenderOnce for RadioWithLabel {
|
|
fn render(self, cx: &mut WindowContext) -> impl IntoElement {
|
|
let inner_diameter = rems_from_px(6.);
|
|
let outer_diameter = rems_from_px(16.);
|
|
let border_width = rems_from_px(1.);
|
|
h_flex()
|
|
.id(self.id)
|
|
.gap(DynamicSpacing::Base08.rems(cx))
|
|
.group("")
|
|
.child(
|
|
div()
|
|
.size(outer_diameter)
|
|
.rounded(outer_diameter / 2.)
|
|
.border_color(cx.theme().colors().border)
|
|
.border(border_width)
|
|
.group_hover("", |el| el.bg(cx.theme().colors().element_hover))
|
|
.when(self.selected, |el| {
|
|
el.child(
|
|
div()
|
|
.m((outer_diameter - inner_diameter) / 2. - border_width)
|
|
.size(inner_diameter)
|
|
.rounded(inner_diameter / 2.)
|
|
.bg(cx.theme().colors().icon_accent),
|
|
)
|
|
}),
|
|
)
|
|
.child(self.label)
|
|
.on_click(move |_event, cx| {
|
|
(self.on_click)(&true, cx);
|
|
})
|
|
}
|
|
}
|