From 28674d6d6a384cd00d294690c2eeeb8fdb7ba4a4 Mon Sep 17 00:00:00 2001 From: Ren Amamiya Date: Mon, 16 Nov 2026 07:50:39 +0700 Subject: [PATCH] tabs: pad scroll containers for shadow bleed --- crates/data/src/tabs.rs | 36 +++++++++++++++++++++++++----------- crates/layout/src/panel.rs | 1 + crates/theme/src/lib.rs | 15 +++++++++++++++ 3 files changed, 41 insertions(+), 11 deletions(-) diff --git a/crates/data/src/tabs.rs b/crates/data/src/tabs.rs index 24154f2..0eeb42b 100644 --- a/crates/data/src/tabs.rs +++ b/crates/data/src/tabs.rs @@ -738,9 +738,17 @@ impl RenderOnce for Tabs { let focus = gpui_native_utils::focus_handle(&self.id, window, cx); // Theme reads end here, so the strip's group chips can take `cx` mutably. - let (medium_text_size, border_color) = { + let (medium_text_size, border_color, shadow_bleed) = { let theme = cx.theme(); - (theme.sizes.medium.text_size, theme.colors.border) + let shadow_bleed = match self.variant { + TabsVariant::Pill => theme.elevations.control.bleed(), + TabsVariant::Underline => Pixels::ZERO, + }; + ( + theme.sizes.medium.text_size, + theme.colors.border, + shadow_bleed, + ) }; let label = self @@ -902,7 +910,7 @@ impl RenderOnce for Tabs { |_, _, _, _| {}, ) .absolute() - .inset_0(); + .inset(shadow_bleed); let trigger_canvas = canvas( { let key = measure_key; @@ -929,6 +937,8 @@ impl RenderOnce for Tabs { root.min_w_0() .flex_grow(1.0) .overflow_hidden() + .p(shadow_bleed) + .m(-shadow_bleed) .child(container_canvas) .child( div() @@ -940,14 +950,18 @@ impl RenderOnce for Tabs { ) .child(control.child(trigger_canvas)) } else if self.overflow_scroll { - root.min_w_0().overflow_x_scroll().child( - div() - .flex_none() - .flex() - .gap_1() - .when(self.variant == TabsVariant::Pill, |row| row.items_center()) - .children(strip), - ) + root.min_w_0() + .overflow_x_scroll() + .p(shadow_bleed) + .m(-shadow_bleed) + .child( + div() + .flex_none() + .flex() + .gap_1() + .when(self.variant == TabsVariant::Pill, |row| row.items_center()) + .children(strip), + ) } else { root.children(strip) } diff --git a/crates/layout/src/panel.rs b/crates/layout/src/panel.rs index 33b0b85..d9116cc 100644 --- a/crates/layout/src/panel.rs +++ b/crates/layout/src/panel.rs @@ -70,6 +70,7 @@ fn island(panel: Div, cx: &App) -> Div { .border_1() .border_color(colors.border) .rounded(theme.radius.overlay) + .overflow_hidden() } /// The panel row drawn under the titlebar. diff --git a/crates/theme/src/lib.rs b/crates/theme/src/lib.rs index 4345242..f3668b7 100644 --- a/crates/theme/src/lib.rs +++ b/crates/theme/src/lib.rs @@ -377,6 +377,21 @@ impl Elevation { } } + /// How far the shadow layers paint past the element's bounds. + pub fn bleed(self) -> Pixels { + self.layers.iter().fold(px(0.), |bleed, layer| { + if layer.color.a > 0. { + bleed.max( + layer.offset_x.abs().max(layer.offset_y.abs()) + + layer.blur_radius + + layer.spread_radius, + ) + } else { + bleed + } + }) + } + /// The gpui shadow list an overlay panel paints with. pub fn shadows(self) -> Vec { self.layers