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

button: Reduce gap between icon and label for small, xsmall button. (#285)

Browse source
This commit is contained in:
Jason Lee 2024-09-27 20:28:57 +08:00 committed by GitHub
parent 69e94cce1c
commit 2b134e47a1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/story/src/button_story.rs
View file

@ -332,6 +332,7 @@ impl Render for ButtonStory {
.child( .child(
Button::new("button-6") Button::new("button-6")
.label("Primary Button") .label("Primary Button")
.icon(IconName::Check)
.primary() .primary()
.small() .small()
.loading(true) .loading(true)
@ -402,6 +403,7 @@ impl Render for ButtonStory {
Button::new("button-xs-1") Button::new("button-xs-1")
.label("Primary Button") .label("Primary Button")
.primary() .primary()
.icon(IconName::Check)
.xsmall() .xsmall()
.disabled(disabled) .disabled(disabled)
.selected(selected) .selected(selected)

7
crates/ui/src/button.rs
View file

@ -425,11 +425,10 @@ impl RenderOnce for Button {
.id("label") .id("label")
.items_center() .items_center()
.justify_center() .justify_center()
.gap_2()
.map(|this| match self.size { .map(|this| match self.size {
Size::XSmall => this.text_xs(), Size::XSmall => this.gap_1().text_xs(),
Size::Small => this.text_sm(), Size::Small => this.gap_1().text_sm(),
_ => this.text_base(), _ => this.gap_2().text_base(),
}) })
.when(!self.loading, |this| { .when(!self.loading, |this| {
this.when_some(self.icon, |this, icon| { this.when_some(self.icon, |this, icon| {