From 853daf953b71aeba32d1f16513bb651b5d44a52a Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Thu, 7 Dec 2023 14:11:30 -0500 Subject: [PATCH] Remove padding from `ButtonSize::None` (#3541) This PR removes the padding from buttons when using `ButtonSize::None`. This fixes the size of the tab close buttons. Release Notes: - N/A --- crates/ui2/src/components/button/button_like.rs | 5 ++++- crates/workspace2/src/pane.rs | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/crates/ui2/src/components/button/button_like.rs b/crates/ui2/src/components/button/button_like.rs index 1a33eb2845..74dfdc45d8 100644 --- a/crates/ui2/src/components/button/button_like.rs +++ b/crates/ui2/src/components/button/button_like.rs @@ -342,7 +342,10 @@ impl RenderOnce for ButtonLike { .when_some(self.width, |this, width| this.w(width)) .rounded_md() .gap_1() - .px_1() + .map(|this| match self.size { + ButtonSize::Default | ButtonSize::Compact => this.px_1(), + ButtonSize::None => this, + }) .bg(self.style.enabled(cx).background) .when(!self.disabled, |this| { this.cursor_pointer() diff --git a/crates/workspace2/src/pane.rs b/crates/workspace2/src/pane.rs index f28759a733..3b1c00994f 100644 --- a/crates/workspace2/src/pane.rs +++ b/crates/workspace2/src/pane.rs @@ -1481,7 +1481,6 @@ impl Pane { }) .start_slot::(indicator) .end_slot( - // TODO: Fix button size IconButton::new("close tab", Icon::Close) .icon_color(Color::Muted) .size(ButtonSize::None)