dan/gpui-component
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

divider: Support custom colors (#459)

Browse source 
<img width="850" alt="image"
src="https://github.com/user-attachments/assets/0161b14d-88ae-4bdf-a515-34df9aefb845">
This commit is contained in:
Floyd Wang 2024-12-03 19:06:10 +08:00 committed by GitHub
parent bdcf552ecf
commit 7560542659
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
crates/story/src/progress_story.rs
View file

@ -145,7 +145,12 @@ impl Render for ProgressStory {
)
.child(Indicator::new().with_size(px(64.))),
)
.child(Divider::horizontal().mt_10().label("Slider"))
.child(
Divider::horizontal()
.mt_10()
.label("Slider")
.color(ui::gray_300()),
)
.child(self.slider1.clone())
.child(format!("Slider 1: {}", self.slider1_value))
.child(

14
crates/ui/src/divider.rs
View file

@ -1,5 +1,5 @@
use gpui::{
div, prelude::FluentBuilder as _, px, Axis, Div, IntoElement, ParentElement, RenderOnce,
div, prelude::FluentBuilder as _, px, Axis, Div, Hsla, IntoElement, ParentElement, RenderOnce,
SharedString, Styled,
};
@ -11,6 +11,7 @@ pub struct Divider {
base: Div,
label: Option<SharedString>,
axis: Axis,
color: Option<Hsla>,
}
impl Divider {
@ -19,6 +20,7 @@ impl Divider {
base: div().h_full(),
axis: Axis::Vertical,
label: None,
color: None,
}
}
@ -27,6 +29,7 @@ impl Divider {
base: div().w_full(),
axis: Axis::Horizontal,
label: None,
color: None,
}
}
@ -34,6 +37,11 @@ impl Divider {
self.label = Some(label.into());
self
}
pub fn color(mut self, color: impl Into<Hsla>) -> Self {
self.color = Some(color.into());
self
}
}
impl Styled for Divider {
@ -43,7 +51,7 @@ impl Styled for Divider {
}
impl RenderOnce for Divider {
fn render(self, cx: &mut gpui::WindowContext) -> impl gpui::IntoElement {
fn render(self, cx: &mut gpui::WindowContext) -> impl IntoElement {
let theme = cx.theme();
self.base
@ -58,7 +66,7 @@ impl RenderOnce for Divider {
Axis::Vertical => this.w(px(1.)).h_full(),
Axis::Horizontal => this.h(px(1.)).w_full(),
})
.bg(cx.theme().border),
.bg(self.color.unwrap_or(cx.theme().border)),
)
.when_some(self.label, |this, label| {
this.child(