From 3a4f442945966e11b0d2da4a8cc1a344f6eccb4c Mon Sep 17 00:00:00 2001 From: Jason Lee Date: Thu, 6 Mar 2025 19:38:45 +0800 Subject: [PATCH] tab: Keep last empty when suffix exist. (#692) --- crates/ui/src/tab/tab.rs | 6 +++--- crates/ui/src/tab/tab_bar.rs | 9 ++++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/crates/ui/src/tab/tab.rs b/crates/ui/src/tab/tab.rs index a0fdf227..a92e2f55 100644 --- a/crates/ui/src/tab/tab.rs +++ b/crates/ui/src/tab/tab.rs @@ -188,8 +188,8 @@ impl TabVariant { ..Default::default() }, TabVariant::Pill => TabStyle { - fg: cx.theme().accent_foreground, - bg: cx.theme().accent, + fg: cx.theme().secondary_foreground, + bg: cx.theme().secondary_hover, borders: Edges::all(px(1.)), border_color: cx.theme().border, radius: px(99.), @@ -210,7 +210,7 @@ impl TabVariant { fg: cx.theme().tab_foreground, bg: cx.theme().transparent, radius: px(0.), - inner_bg: cx.theme().accent, + inner_bg: cx.theme().secondary, inner_radius: cx.theme().radius, borders: Edges { bottom: px(2.), diff --git a/crates/ui/src/tab/tab_bar.rs b/crates/ui/src/tab/tab_bar.rs index c0239096..ce16a25d 100644 --- a/crates/ui/src/tab/tab_bar.rs +++ b/crates/ui/src/tab/tab_bar.rs @@ -224,9 +224,12 @@ impl RenderOnce for TabBar { }) }), ) - .when(self.variant == TabVariant::Tab, |this| { - this.child(self.last_empty_space) - }), + .when( + self.suffix.is_some() && self.variant == TabVariant::Tab + || self.variant == TabVariant::Underline + || self.variant == TabVariant::Pill, + |this| this.child(self.last_empty_space), + ), ) .when_some(self.suffix, |this, suffix| this.child(suffix)) }