Polish vertical tab lifecycle: hover ≠ active, close as a coin

Active and hover used the same ACTIVE_NAV_BG, so a selected row gave
no feedback when the cursor crossed it — the contrast ladder was a
single rung. Replace it with a four-state ladder shared by the home
anchor, launcher rows, and tab rows:

  rest   → transparent   (HOVER_NAV_BG hover)
  active → ACTIVE_NAV_BG (ACTIVE_NAV_BG_HOVER hover)

The choice lives in nav_row_palette(active) so the ladder cannot
silently disagree across the three callers. Close (×) becomes an
18 px circular coin (was a 16 px square) with the warm-dark hover
wash from CLOSE_HOVER_BG, shared by both row variants via a single
render_row_close_button recipe — the button now reads as something
to press, not a glyph in a square.

Hoist sidebar_chrome.rs alongside sidebar.rs to host the shared
constants/helpers and keep both files under the 500-line ceiling
(444 / 198). cargo test ely_app --bin ely_app: 103 passed.
This commit is contained in:
2026-05-10 01:28:39 -04:00
parent 7c27f7308c
commit 25ff653d83
3 changed files with 304 additions and 222 deletions
+2 -1
View File
@@ -11,6 +11,7 @@ pub(crate) mod plugin_detail_view;
pub(crate) mod plugin_labels; pub(crate) mod plugin_labels;
pub(crate) mod settings_layout; pub(crate) mod settings_layout;
pub(crate) mod sidebar; pub(crate) mod sidebar;
pub(crate) mod sidebar_chrome;
pub(crate) mod sidebar_header; pub(crate) mod sidebar_header;
pub(crate) mod split_pane; pub(crate) mod split_pane;
pub(crate) mod topbar; pub(crate) mod topbar;
@@ -23,7 +24,7 @@ pub(crate) use command_overlay::render_command_overlay;
pub(crate) use home::render_home_page; pub(crate) use home::render_home_page;
pub(crate) use plugin_detail_view::render_plugin_detail_view; pub(crate) use plugin_detail_view::render_plugin_detail_view;
pub(crate) use settings_layout::render_settings_shell; pub(crate) use settings_layout::render_settings_shell;
pub(crate) use sidebar::{panel_bg, panel_shadow}; pub(crate) use sidebar_chrome::{panel_bg, panel_shadow};
pub(crate) use sidebar_header::{ pub(crate) use sidebar_header::{
WorkspaceDisclosureAnchor, render_sidebar_header, render_workspace_disclosure, WorkspaceDisclosureAnchor, render_sidebar_header, render_workspace_disclosure,
render_workspace_disclosure_backdrop, render_workspace_disclosure_backdrop,
+104 -221
View File
@@ -2,15 +2,24 @@ use ely_browser_core::BrowserSnapshot;
use ely_design_system::{colors, spacing}; use ely_design_system::{colors, spacing};
use ely_domain::BrowserTab; use ely_domain::BrowserTab;
use gpui::{ use gpui::{
AnyElement, BoxShadow, Context, InteractiveElement, IntoElement, MouseButton, AnyElement, Context, FontWeight, InteractiveElement, IntoElement, ParentElement,
ParentElement, SharedString, StatefulInteractiveElement, Styled, div, hsla, SharedString, StatefulInteractiveElement, Styled, div, hsla, linear_color_stop,
linear_color_stop, linear_gradient, point, prelude::FluentBuilder, px, rgb, rgba, linear_gradient, prelude::FluentBuilder, px, rgb, rgba,
}; };
use gpui_component::{IconName, StyledExt, scroll::ScrollableElement}; use gpui_component::{IconName, StyledExt, scroll::ScrollableElement};
use crate::shell::ElyShell; use crate::shell::ElyShell;
use crate::shell::chrome::sidebar_chrome::{
ACTIVE_NAV_BG, ACTIVE_NAV_BG_HOVER, CLOSE_HOVER_BG, HIGHLIGHT_BORDER, HOVER_NAV_BG,
ROW_CLOSE_SIZE, panel_bg, panel_shadow, profile_initial, render_sidebar_resize_handle,
render_unread_badge, section_label, section_tabs_label, soft_shadow,
};
use crate::shell::chrome::{render_glyph_for, render_sidebar_header}; use crate::shell::chrome::{render_glyph_for, render_sidebar_header};
// `panel_bg` and `panel_shadow` are re-exported from `chrome::mod` via
// `sidebar_chrome` so external callers (`shell::render`, command overlay)
// keep their existing import paths.
impl ElyShell { impl ElyShell {
pub(crate) fn render_expanded_sidebar( pub(crate) fn render_expanded_sidebar(
&mut self, &mut self,
@@ -92,6 +101,10 @@ impl ElyShell {
} }
fn render_settings_row(&mut self, cx: &mut Context<Self>) -> AnyElement { fn render_settings_row(&mut self, cx: &mut Context<Self>) -> AnyElement {
// Settings is never an "active" row — only ever rest or hover —
// so it uses HOVER_NAV_BG directly. Keeping it lighter than the
// active nav card means the eye still finds the active selection
// first when both are visible.
div() div()
.id(SharedString::from("nav-settings")) .id(SharedString::from("nav-settings"))
.rounded(px(spacing::RADIUS_NAV)) .rounded(px(spacing::RADIUS_NAV))
@@ -103,7 +116,7 @@ impl ElyShell {
.text_size(px(13.0)) .text_size(px(13.0))
.text_color(rgb(colors::INK_2)) .text_color(rgb(colors::INK_2))
.cursor_pointer() .cursor_pointer()
.hover(|style| style.bg(rgba(ACTIVE_NAV_BG)).text_color(rgb(colors::INK))) .hover(|style| style.bg(rgba(HOVER_NAV_BG)).text_color(rgb(colors::INK)))
.active(|style| style.opacity(0.82)) .active(|style| style.opacity(0.82))
.on_click(cx.listener(|shell, _, window, cx| { .on_click(cx.listener(|shell, _, window, cx| {
shell.open_internal_tab("ely://settings", window, cx); shell.open_internal_tab("ely://settings", window, cx);
@@ -133,7 +146,7 @@ impl ElyShell {
.flex() .flex()
.items_center() .items_center()
.cursor_pointer() .cursor_pointer()
.hover(|style| style.bg(rgba(ACTIVE_NAV_BG))) .hover(|style| style.bg(rgba(HOVER_NAV_BG)))
.active(|style| style.opacity(0.82)) .active(|style| style.opacity(0.82))
.on_click(cx.listener(|shell, _, window, cx| { .on_click(cx.listener(|shell, _, window, cx| {
shell.open_internal_tab("ely://settings/profiles", window, cx); shell.open_internal_tab("ely://settings/profiles", window, cx);
@@ -164,7 +177,7 @@ impl ElyShell {
.min_w_0() .min_w_0()
.truncate() .truncate()
.text_size(px(13.0)) .text_size(px(13.0))
.font_weight(gpui::FontWeight(500.0)) .font_weight(FontWeight(500.0))
.text_color(rgb(colors::INK_2)) .text_color(rgb(colors::INK_2))
.child(profile_name), .child(profile_name),
) )
@@ -192,8 +205,7 @@ impl ElyShell {
let active = active_tab let active = active_tab
.map(|tab| tab.url().as_str() == "ely://new-tab") .map(|tab| tab.url().as_str() == "ely://new-tab")
.unwrap_or(false); .unwrap_or(false);
let bg_color = if active { ACTIVE_NAV_BG } else { 0x00000000 }; let palette = nav_row_palette(active);
let text_color = if active { colors::INK } else { colors::INK_2 };
div() div()
.id(SharedString::from("nav-home")) .id(SharedString::from("nav-home"))
@@ -204,9 +216,9 @@ impl ElyShell {
.flex() .flex()
.items_center() .items_center()
.cursor_pointer() .cursor_pointer()
.hover(|style| style.bg(rgba(ACTIVE_NAV_BG))) .hover(move |style| style.bg(rgba(palette.hover_bg)))
.active(|style| style.opacity(0.82)) .active(|style| style.opacity(0.82))
.bg(rgba(bg_color)) .bg(rgba(palette.bg))
.when(active, |el| el.shadow(soft_shadow())) .when(active, |el| el.shadow(soft_shadow()))
.on_click(cx.listener(|shell, _, window, cx| { .on_click(cx.listener(|shell, _, window, cx| {
shell.open_internal_tab("ely://new-tab", window, cx); shell.open_internal_tab("ely://new-tab", window, cx);
@@ -216,8 +228,8 @@ impl ElyShell {
div() div()
.flex_1() .flex_1()
.text_size(px(13.0)) .text_size(px(13.0))
.font_weight(gpui::FontWeight(500.0)) .font_weight(FontWeight(500.0))
.text_color(rgb(text_color)) .text_color(rgb(palette.text))
.child("Home"), .child("Home"),
) )
.into_any_element() .into_any_element()
@@ -231,8 +243,7 @@ impl ElyShell {
) -> AnyElement { ) -> AnyElement {
let tab_id = tab.id().clone(); let tab_id = tab.id().clone();
let close_tab_id = tab.id().clone(); let close_tab_id = tab.id().clone();
let bg_color = if active { ACTIVE_NAV_BG } else { 0x00000000 }; let palette = nav_row_palette(active);
let text_color = if active { colors::INK } else { colors::INK_2 };
let host = tab.url().host().map(|host| host.to_string()); let host = tab.url().host().map(|host| host.to_string());
let title = tab.title().to_string(); let title = tab.title().to_string();
let initial = title.chars().next().unwrap_or('?').to_string(); let initial = title.chars().next().unwrap_or('?').to_string();
@@ -250,9 +261,9 @@ impl ElyShell {
.flex() .flex()
.items_center() .items_center()
.cursor_pointer() .cursor_pointer()
.hover(|style| style.bg(rgba(ACTIVE_NAV_BG))) .hover(move |style| style.bg(rgba(palette.hover_bg)))
.active(|style| style.opacity(0.82)) .active(|style| style.opacity(0.82))
.bg(rgba(bg_color)) .bg(rgba(palette.bg))
.when(active, |el| el.shadow(soft_shadow())) .when(active, |el| el.shadow(soft_shadow()))
.on_click(cx.listener(move |shell, _, window, cx| { .on_click(cx.listener(move |shell, _, window, cx| {
shell.select_tab(&tab_id, window, cx); shell.select_tab(&tab_id, window, cx);
@@ -265,31 +276,19 @@ impl ElyShell {
.overflow_hidden() .overflow_hidden()
.truncate() .truncate()
.text_size(px(13.0)) .text_size(px(13.0))
.font_weight(gpui::FontWeight(500.0)) .font_weight(FontWeight(500.0))
.text_color(rgb(text_color)) .text_color(rgb(palette.text))
.child(title), .child(title),
) )
.when(unread > 0, |el| el.child(render_unread_badge(unread))) .when(unread > 0, |el| el.child(render_unread_badge(unread)))
.child( .child(render_row_close_button(
div() close_id,
.id(close_id) group_name,
.size(px(16.0)) cx.listener(move |shell, _, window, cx| {
.rounded(px(4.0)) shell.close_tab_by_id(&close_tab_id, window, cx);
.flex_shrink_0() cx.stop_propagation();
.flex() }),
.items_center() ))
.justify_center()
.text_color(rgb(colors::INK_4))
.opacity(0.0)
.group_hover(group_name, |style| style.opacity(1.0))
.hover(|style| style.bg(rgba(CLOSE_HOVER_BG)).text_color(rgb(colors::INK)))
.cursor_pointer()
.on_click(cx.listener(move |shell, _, window, cx| {
shell.close_tab_by_id(&close_tab_id, window, cx);
cx.stop_propagation();
}))
.child(IconName::Close),
)
.into_any_element() .into_any_element()
} }
@@ -305,7 +304,7 @@ impl ElyShell {
.text_color(rgb(colors::INK_3)) .text_color(rgb(colors::INK_3))
.text_size(px(13.0)) .text_size(px(13.0))
.cursor_pointer() .cursor_pointer()
.hover(|style| style.bg(rgba(ACTIVE_NAV_BG)).text_color(rgb(colors::INK))) .hover(|style| style.bg(rgba(HOVER_NAV_BG)).text_color(rgb(colors::INK)))
.active(|style| style.opacity(0.82)) .active(|style| style.opacity(0.82))
.on_click(cx.listener(|shell, _, window, cx| { .on_click(cx.listener(|shell, _, window, cx| {
shell.open_new_tab(window, cx); shell.open_new_tab(window, cx);
@@ -327,8 +326,7 @@ impl ElyShell {
) -> AnyElement { ) -> AnyElement {
let tab_id = tab.id().clone(); let tab_id = tab.id().clone();
let close_tab_id = tab.id().clone(); let close_tab_id = tab.id().clone();
let bg_color = if active { ACTIVE_NAV_BG } else { 0x00000000 }; let palette = nav_row_palette(active);
let text_color = if active { colors::INK } else { colors::INK_2 };
let group_name = SharedString::from(format!("tab-{}", tab.id().as_str())); let group_name = SharedString::from(format!("tab-{}", tab.id().as_str()));
let close_id = SharedString::from(format!("tab-close-{}", tab.id().as_str())); let close_id = SharedString::from(format!("tab-close-{}", tab.id().as_str()));
@@ -342,9 +340,9 @@ impl ElyShell {
.flex() .flex()
.items_center() .items_center()
.cursor_pointer() .cursor_pointer()
.hover(|style| style.bg(rgba(ACTIVE_NAV_BG))) .hover(move |style| style.bg(rgba(palette.hover_bg)))
.active(|style| style.opacity(0.82)) .active(|style| style.opacity(0.82))
.bg(rgba(bg_color)) .bg(rgba(palette.bg))
.when(active, |el| el.shadow(soft_shadow())) .when(active, |el| el.shadow(soft_shadow()))
.on_click(cx.listener(move |shell, _, window, cx| { .on_click(cx.listener(move |shell, _, window, cx| {
shell.select_tab(&tab_id, window, cx); shell.select_tab(&tab_id, window, cx);
@@ -359,8 +357,8 @@ impl ElyShell {
.child( .child(
div() div()
.text_size(px(13.0)) .text_size(px(13.0))
.font_weight(gpui::FontWeight(500.0)) .font_weight(FontWeight(500.0))
.text_color(rgb(text_color)) .text_color(rgb(palette.text))
.truncate() .truncate()
.child(tab.title().to_string()), .child(tab.title().to_string()),
) )
@@ -372,190 +370,75 @@ impl ElyShell {
.child(tab.display_url()), .child(tab.display_url()),
), ),
) )
.child( .child(render_row_close_button(
div() close_id,
.id(close_id) group_name,
.size(px(16.0)) cx.listener(move |shell, _, window, cx| {
.rounded(px(4.0)) shell.close_tab_by_id(&close_tab_id, window, cx);
.flex_shrink_0() cx.stop_propagation();
.flex() }),
.items_center() ))
.justify_center()
.text_color(rgb(colors::INK_4))
.opacity(0.0)
.group_hover(group_name, |style| style.opacity(1.0))
.hover(|style| style.bg(rgba(CLOSE_HOVER_BG)).text_color(rgb(colors::INK)))
.cursor_pointer()
.on_click(cx.listener(move |shell, _, window, cx| {
shell.close_tab_by_id(&close_tab_id, window, cx);
cx.stop_propagation();
}))
.child(IconName::Close),
)
.into_any_element() .into_any_element()
} }
} }
fn profile_initial(name: &str) -> String { /// Resolve the three colors a selectable nav row paints in based on
name.chars() /// its active state. Centralising the choice means launcher row, tab
.next() /// row, and home anchor row can never disagree on what "active" looks
.unwrap_or('P') /// like — and a future tweak to the contrast ladder lands in one
.to_uppercase() /// place rather than three transparent-sentinel triples.
.to_string() fn nav_row_palette(active: bool) -> NavRowPalette {
} if active {
NavRowPalette {
fn render_unread_badge(count: u32) -> impl IntoElement { bg: ACTIVE_NAV_BG,
let label = if count > 99 { hover_bg: ACTIVE_NAV_BG_HOVER,
"99+".to_string() text: colors::INK,
}
} else { } else {
count.to_string() NavRowPalette {
}; bg: 0x00000000,
hover_bg: HOVER_NAV_BG,
div() text: colors::INK_2,
.px(px(6.0)) }
.py(px(1.0))
.rounded(px(999.0))
.bg(rgba(UNREAD_BADGE_BG))
.text_size(px(10.0))
.font_weight(gpui::FontWeight(500.0))
.text_color(rgb(colors::INK_3))
.child(label)
}
fn section_tabs_label(count: usize) -> impl IntoElement {
div()
.pt(px(12.0))
.pb(px(4.0))
.px(px(10.0))
.flex()
.items_center()
.gap(px(6.0))
.child(
div()
.text_color(rgb(colors::INK_4))
.child(IconName::Frame),
)
.child(
div()
.text_size(px(10.5))
.font_weight(gpui::FontWeight(500.0))
.text_color(rgb(colors::INK_4))
.child(format!("TABS · {count}")),
)
}
fn section_label(label: &'static str) -> impl IntoElement {
div()
.pt(px(8.0))
.pb(px(4.0))
.px(px(10.0))
.text_size(px(10.5))
.font_weight(gpui::FontWeight(500.0))
.text_color(rgb(colors::INK_4))
.child(label)
}
pub(crate) const ACTIVE_NAV_BG: u32 = 0xffffffd9;
/// Hover tint behind the per-row close (×) button. Was 8% alpha, which
/// was visually indistinguishable from the panel background and made
/// the click target read as inert. Brought to ~30% alpha so the
/// hover registers as a real "press here" surface, matching the
/// confidence of close buttons in Arc/Dia/Zen.
const CLOSE_HOVER_BG: u32 = 0x281e144d;
const UNREAD_BADGE_BG: u32 = 0x281e140f;
/// 50% white inner border that traces every glass panel — the GPUI
/// substitute for the design's `box-shadow: inset 0 0 0 1px rgba(255,255,255,0.5)`.
/// Painted as the panel's own border so it stays part of the frame and
/// never participates in hit testing.
const HIGHLIGHT_BORDER: u32 = 0xffffff80;
/// Sidebar resize affordance straddling the panel's right edge. The
/// strip lives in the outer wrapper (not the rounded inner panel) so
/// it isn't swallowed by `overflow_hidden`; it spans 4 px outside the
/// panel and 4 px inside, giving the cursor a comfortably wide hit
/// surface that still reads as "edge of the panel" rather than
/// "stripe across the layout".
fn render_sidebar_resize_handle(cx: &mut Context<ElyShell>) -> AnyElement {
div()
.id(SharedString::from("sidebar-resize-handle"))
.absolute()
.top_0()
.bottom_0()
.right(px(-4.0))
.w(px(8.0))
.cursor_col_resize()
.hover(|style| style.bg(rgba(RESIZE_HANDLE_HOVER_BG)))
.on_mouse_down(
MouseButton::Left,
cx.listener(|shell, event: &gpui::MouseDownEvent, _, cx| {
shell.begin_sidebar_resize(f32::from(event.position.x), cx);
}),
)
.into_any_element()
}
const RESIZE_HANDLE_HOVER_BG: u32 = 0xffaa7733;
/// Maps appearance translucency_pct to a panel rgba u32 tinted by the
/// active wallpaper theme.
///
/// GPUI 0.2.2 has no backdrop-filter, so a true sample-and-blur is
/// impossible. Instead the panel base RGB is pre-tinted with the
/// wallpaper's character (warm cream for Dawn, lavender for Violet, etc.)
/// so the wallpaper's mood reads through every translucent panel without
/// any extra layer or shader. Combined with the user-controlled
/// translucency_pct it gives the design's "frosted glass tied to the
/// wallpaper" effect entirely from real GPUI primitives.
pub(crate) fn panel_bg(snapshot: &BrowserSnapshot) -> u32 {
let pct = snapshot.appearance.translucency_pct().min(100) as u32;
let max_alpha: u32 = 0xff;
let min_alpha: u32 = 0xb3;
let alpha = max_alpha - (pct * (max_alpha - min_alpha)) / 100;
let rgb = wallpaper_panel_rgb(snapshot.appearance.wallpaper());
(rgb << 8) | alpha
}
fn wallpaper_panel_rgb(theme: ely_domain::WallpaperTheme) -> u32 {
match theme {
ely_domain::WallpaperTheme::Dawn => 0xfaf6f0,
ely_domain::WallpaperTheme::Violet => 0xf6f3f8,
ely_domain::WallpaperTheme::Mint => 0xf3f6f1,
ely_domain::WallpaperTheme::Slate => 0xeff1f4,
} }
} }
pub(crate) fn panel_shadow() -> Vec<BoxShadow> { #[derive(Clone, Copy)]
vec![ struct NavRowPalette {
BoxShadow { bg: u32,
color: hsla(25.0 / 360.0, 0.33, 0.12, 0.30), hover_bg: u32,
offset: point(px(0.), px(20.)), text: u32,
blur_radius: px(50.),
spread_radius: px(-15.),
},
BoxShadow {
color: hsla(0., 0., 1., 0.5),
offset: point(px(0.), px(0.)),
blur_radius: px(0.),
spread_radius: px(1.),
},
]
} }
pub(crate) fn soft_shadow() -> Vec<BoxShadow> { /// Per-row close (×) button shared by the launcher and tab rows.
vec![ ///
BoxShadow { /// Centralising the recipe keeps both rows obeying the same physical
color: hsla(0., 0., 1., 0.7), /// rules: an 18 px circle (a coin, not a glyph), invisible until the
offset: point(px(0.), px(1.)), /// row is hovered, with a warm-dark wash on direct hover so the
blur_radius: px(0.), /// button itself acknowledges the cursor before the click. The close
spread_radius: px(0.), /// hit target stays `flex_shrink_0` so a long title can never push
}, /// the button into a sub-pixel sliver.
BoxShadow { fn render_row_close_button<F>(
color: hsla(25.0 / 360.0, 0.33, 0.12, 0.08), close_id: SharedString,
offset: point(px(0.), px(0.)), group_name: SharedString,
blur_radius: px(0.), on_click: F,
spread_radius: px(1.), ) -> impl IntoElement
}, where
] F: Fn(&gpui::ClickEvent, &mut gpui::Window, &mut gpui::App) + 'static,
{
div()
.id(close_id)
.size(px(ROW_CLOSE_SIZE))
.rounded_full()
.flex_shrink_0()
.flex()
.items_center()
.justify_center()
.text_color(rgb(colors::INK_4))
.opacity(0.0)
.group_hover(group_name, |style| style.opacity(1.0))
.hover(|style| style.bg(rgba(CLOSE_HOVER_BG)).text_color(rgb(colors::INK)))
.cursor_pointer()
.on_click(on_click)
.child(IconName::Close)
} }
@@ -0,0 +1,198 @@
use ely_browser_core::BrowserSnapshot;
use ely_design_system::colors;
use gpui::{
AnyElement, BoxShadow, Context, FontWeight, InteractiveElement, IntoElement,
MouseButton, ParentElement, SharedString, Styled, div, hsla, point, px, rgb, rgba,
};
use gpui_component::IconName;
use crate::shell::ElyShell;
/// Hover/active palette for the vertical sidebar rows.
///
/// The original code reused `ACTIVE_NAV_BG` for both `active` and
/// `hover`, which made an already-active row visually inert under the
/// cursor — the object refused to acknowledge the touch. The four
/// tokens below split that single value into a four-step ladder:
///
/// rest (transparent) → HOVER_NAV_BG → ACTIVE_NAV_BG → ACTIVE_NAV_BG_HOVER
///
/// so every state transition produces a real, perceptible change.
///
/// Values were picked by eye against the warm panel tint, then nudged
/// until the wash on a Dawn-themed panel reads as "you touched this"
/// without competing with the active selection's authority.
pub(crate) const HOVER_NAV_BG: u32 = 0xffffff66; // 40% white wash
pub(crate) const ACTIVE_NAV_BG: u32 = 0xffffffd9; // 85% white card
pub(crate) const ACTIVE_NAV_BG_HOVER: u32 = 0xfffffff2; // 95% white — active + hover
/// Hover tint behind the per-row close (×) button. Was 8% alpha, which
/// was visually indistinguishable from the panel background and made
/// the click target read as inert. Brought to ~30% alpha so the
/// hover registers as a real "press here" surface, matching the
/// confidence of close buttons in Arc/Dia/Zen.
pub(crate) const CLOSE_HOVER_BG: u32 = 0x281e144d;
pub(crate) const UNREAD_BADGE_BG: u32 = 0x281e140f;
/// 50% white inner border that traces every glass panel — the GPUI
/// substitute for the design's `box-shadow: inset 0 0 0 1px rgba(255,255,255,0.5)`.
/// Painted as the panel's own border so it stays part of the frame and
/// never participates in hit testing.
pub(crate) const HIGHLIGHT_BORDER: u32 = 0xffffff80;
pub(crate) const RESIZE_HANDLE_HOVER_BG: u32 = 0xffaa7733;
/// Diameter of the row-level close (×) button.
///
/// 16 px read as a glyph squeezed into a square; 18 px paired with
/// `rounded_full()` reads as a small physical coin you can press.
/// The extra two pixels also give the hover wash room to feel like
/// a halo around the icon instead of a tight collar.
pub(crate) const ROW_CLOSE_SIZE: f32 = 18.0;
pub(crate) fn profile_initial(name: &str) -> String {
name.chars()
.next()
.unwrap_or('P')
.to_uppercase()
.to_string()
}
pub(crate) fn render_unread_badge(count: u32) -> impl IntoElement {
let label = if count > 99 {
"99+".to_string()
} else {
count.to_string()
};
div()
.px(px(6.0))
.py(px(1.0))
.rounded(px(999.0))
.bg(rgba(UNREAD_BADGE_BG))
.text_size(px(10.0))
.font_weight(FontWeight(500.0))
.text_color(rgb(colors::INK_3))
.child(label)
}
pub(crate) fn section_tabs_label(count: usize) -> impl IntoElement {
div()
.pt(px(12.0))
.pb(px(4.0))
.px(px(10.0))
.flex()
.items_center()
.gap(px(6.0))
.child(
div()
.text_color(rgb(colors::INK_4))
.child(IconName::Frame),
)
.child(
div()
.text_size(px(10.5))
.font_weight(FontWeight(500.0))
.text_color(rgb(colors::INK_4))
.child(format!("TABS · {count}")),
)
}
pub(crate) fn section_label(label: &'static str) -> impl IntoElement {
div()
.pt(px(8.0))
.pb(px(4.0))
.px(px(10.0))
.text_size(px(10.5))
.font_weight(FontWeight(500.0))
.text_color(rgb(colors::INK_4))
.child(label)
}
/// Sidebar resize affordance straddling the panel's right edge. The
/// strip lives in the outer wrapper (not the rounded inner panel) so
/// it isn't swallowed by `overflow_hidden`; it spans 4 px outside the
/// panel and 4 px inside, giving the cursor a comfortably wide hit
/// surface that still reads as "edge of the panel" rather than
/// "stripe across the layout".
pub(crate) fn render_sidebar_resize_handle(cx: &mut Context<ElyShell>) -> AnyElement {
div()
.id(SharedString::from("sidebar-resize-handle"))
.absolute()
.top_0()
.bottom_0()
.right(px(-4.0))
.w(px(8.0))
.cursor_col_resize()
.hover(|style| style.bg(rgba(RESIZE_HANDLE_HOVER_BG)))
.on_mouse_down(
MouseButton::Left,
cx.listener(|shell, event: &gpui::MouseDownEvent, _, cx| {
shell.begin_sidebar_resize(f32::from(event.position.x), cx);
}),
)
.into_any_element()
}
/// Maps appearance translucency_pct to a panel rgba u32 tinted by the
/// active wallpaper theme.
///
/// GPUI 0.2.2 has no backdrop-filter, so a true sample-and-blur is
/// impossible. Instead the panel base RGB is pre-tinted with the
/// wallpaper's character (warm cream for Dawn, lavender for Violet, etc.)
/// so the wallpaper's mood reads through every translucent panel without
/// any extra layer or shader. Combined with the user-controlled
/// translucency_pct it gives the design's "frosted glass tied to the
/// wallpaper" effect entirely from real GPUI primitives.
pub(crate) fn panel_bg(snapshot: &BrowserSnapshot) -> u32 {
let pct = snapshot.appearance.translucency_pct().min(100) as u32;
let max_alpha: u32 = 0xff;
let min_alpha: u32 = 0xb3;
let alpha = max_alpha - (pct * (max_alpha - min_alpha)) / 100;
let rgb = wallpaper_panel_rgb(snapshot.appearance.wallpaper());
(rgb << 8) | alpha
}
fn wallpaper_panel_rgb(theme: ely_domain::WallpaperTheme) -> u32 {
match theme {
ely_domain::WallpaperTheme::Dawn => 0xfaf6f0,
ely_domain::WallpaperTheme::Violet => 0xf6f3f8,
ely_domain::WallpaperTheme::Mint => 0xf3f6f1,
ely_domain::WallpaperTheme::Slate => 0xeff1f4,
}
}
pub(crate) fn panel_shadow() -> Vec<BoxShadow> {
vec![
BoxShadow {
color: hsla(25.0 / 360.0, 0.33, 0.12, 0.30),
offset: point(px(0.), px(20.)),
blur_radius: px(50.),
spread_radius: px(-15.),
},
BoxShadow {
color: hsla(0., 0., 1., 0.5),
offset: point(px(0.), px(0.)),
blur_radius: px(0.),
spread_radius: px(1.),
},
]
}
pub(crate) fn soft_shadow() -> Vec<BoxShadow> {
vec![
BoxShadow {
color: hsla(0., 0., 1., 0.7),
offset: point(px(0.), px(1.)),
blur_radius: px(0.),
spread_radius: px(0.),
},
BoxShadow {
color: hsla(25.0 / 360.0, 0.33, 0.12, 0.08),
offset: point(px(0.), px(0.)),
blur_radius: px(0.),
spread_radius: px(1.),
},
]
}