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
57 lines
1.4 KiB
Rust
57 lines
1.4 KiB
Rust
#![allow(missing_docs)]
|
|
|
|
use crate::prelude::*;
|
|
use gpui::*;
|
|
|
|
#[derive(IntoElement)]
|
|
pub struct ToolStrip {
|
|
id: ElementId,
|
|
tools: Vec<IconButton>,
|
|
axis: Axis,
|
|
}
|
|
|
|
impl ToolStrip {
|
|
fn new(id: ElementId, axis: Axis) -> Self {
|
|
Self {
|
|
id,
|
|
tools: vec![],
|
|
axis,
|
|
}
|
|
}
|
|
|
|
pub fn vertical(id: impl Into<ElementId>) -> Self {
|
|
Self::new(id.into(), Axis::Vertical)
|
|
}
|
|
|
|
pub fn tools(mut self, tools: Vec<IconButton>) -> Self {
|
|
self.tools = tools;
|
|
self
|
|
}
|
|
|
|
pub fn tool(mut self, tool: IconButton) -> Self {
|
|
self.tools.push(tool);
|
|
self
|
|
}
|
|
}
|
|
|
|
impl RenderOnce for ToolStrip {
|
|
fn render(self, cx: &mut WindowContext) -> impl IntoElement {
|
|
let group = format!("tool_strip_{}", self.id.clone());
|
|
|
|
div()
|
|
.id(self.id.clone())
|
|
.group(group)
|
|
.map(|element| match self.axis {
|
|
Axis::Vertical => element.v_flex(),
|
|
Axis::Horizontal => element.h_flex(),
|
|
})
|
|
.flex_none()
|
|
.gap(DynamicSpacing::Base04.rems(cx))
|
|
.p(DynamicSpacing::Base02.rems(cx))
|
|
.border_1()
|
|
.border_color(cx.theme().colors().border)
|
|
.rounded(rems_from_px(6.0))
|
|
.bg(cx.theme().colors().elevated_surface_background)
|
|
.children(self.tools)
|
|
}
|
|
}
|