ZacharyZhang-NY/ELY-Browser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove broken sidebar Layout cards from appearance settings

Browse Source 
The three layout preset cards (Single column / Compact / Hidden on
hover) painted as bright white boxes regardless of theme, never
implemented the layouts they previewed, and duplicated the live
sidebar resize handle which already covers the same intent. Drop
the section, the supporting `appearance_layout_cards` module, and
the chrome `mod` declaration that re-exported it.
This commit is contained in:
ZacharyZhang-NY
2026-05-15 21:18:10 -04:00
parent 81a75f6489
commit 838f80006a
3 changed files with 1 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ely_app/src/shell/chrome/appearance_form.rs
+1 -4
View File
@@ -8,8 +8,6 @@ use gpui::{
};
use gpui_component::{IconName, scroll::ScrollableElement, slider::Slider};
use super::appearance_layout_cards::render_sidebar_layout_section;
use crate::shell::ElyShell;
use crate::shell::chrome::SERIF_FAMILY;
@@ -35,8 +33,7 @@ pub(crate) fn render_appearance_form(
.child(render_header())
.child(render_wallpaper_grid(snapshot, cx))
.child(render_appearance_rows(shell, snapshot, cx))
.child(render_translucency_presets(cx))
.child(render_sidebar_layout_section(snapshot, cx)),
.child(render_translucency_presets(cx)),
)
.into_any_element()
}
crates/ely_app/src/shell/chrome/appearance_layout_cards.rs
-191
View File
@@ -1,191 +0,0 @@
use ely_browser_core::BrowserSnapshot;
use ely_design_system::colors;
use ely_domain::{COLLAPSED_SIDEBAR_WIDTH_PX, DEFAULT_SIDEBAR_WIDTH_PX, HIDDEN_SIDEBAR_WIDTH_PX};
use gpui::{
AnyElement, Context, FontWeight, InteractiveElement, IntoElement, ParentElement, SharedString,
StatefulInteractiveElement, Styled, div, prelude::FluentBuilder, px, rgb, rgba,
};
use crate::shell::ElyShell;
use crate::shell::chrome::SERIF_FAMILY;
pub(crate) fn render_sidebar_layout_section(
snapshot: &BrowserSnapshot,
cx: &mut Context<ElyShell>,
) -> AnyElement {
let active_width = snapshot
.spaces
.iter()
.find(|space| space.id() == &snapshot.active_space_id)
.map(|space| space.sidebar_width_px())
.unwrap_or(DEFAULT_SIDEBAR_WIDTH_PX);
let mode = LayoutMode::from_width(active_width);
div()
.flex()
.flex_col()
.gap(px(14.0))
.pt(px(8.0))
.child(div().text_size(px(11.0)).text_color(rgb(colors::ink_4())).child("SIDEBAR"))
.child(
div()
.font_family(SERIF_FAMILY)
.text_size(px(22.0))
.font_weight(FontWeight(400.0))
.text_color(rgb(colors::ink()))
.child("Layout"),
)
.child(
div()
.grid()
.grid_cols(3)
.gap(px(10.0))
.child(render_layout_card(
"Single column",
"Default · workspace + tabs.",
mode == LayoutMode::Single,
LayoutMode::Single,
cx,
))
.child(render_layout_card(
"Compact",
"Icons-only with launcher rail.",
mode == LayoutMode::Compact,
LayoutMode::Compact,
cx,
))
.child(render_layout_card(
"Hidden on hover",
"Slide in on cursor reach.",
mode == LayoutMode::Hidden,
LayoutMode::Hidden,
cx,
)),
)
.into_any_element()
}
#[derive(Clone, Copy, Eq, PartialEq)]
enum LayoutMode {
Single,
Compact,
Hidden,
}
impl LayoutMode {
fn from_width(width: u16) -> Self {
if width <= HIDDEN_SIDEBAR_WIDTH_PX {
Self::Hidden
} else if width <= COLLAPSED_SIDEBAR_WIDTH_PX {
Self::Compact
} else {
Self::Single
}
}
fn width(self) -> u16 {
match self {
Self::Single => DEFAULT_SIDEBAR_WIDTH_PX,
Self::Compact => COLLAPSED_SIDEBAR_WIDTH_PX,
Self::Hidden => HIDDEN_SIDEBAR_WIDTH_PX,
}
}
fn id(self) -> &'static str {
match self {
Self::Single => "layout-single",
Self::Compact => "layout-compact",
Self::Hidden => "layout-hidden",
}
}
fn preview_sidebar(self) -> f32 {
match self {
Self::Single => 56.0,
Self::Compact => 18.0,
Self::Hidden => 6.0,
}
}
}
fn render_layout_card(
title: &'static str,
detail: &'static str,
selected: bool,
mode: LayoutMode,
cx: &mut Context<ElyShell>,
) -> AnyElement {
div()
.id(SharedString::from(mode.id()))
.p(px(14.0))
.rounded(px(14.0))
.bg(rgba(layout_card_bg()))
.when(selected, |el| el.border_2().border_color(rgb(colors::accent())))
.when(!selected, |el| el.border_1().border_color(rgba(colors::stroke())))
.flex()
.flex_col()
.gap(px(10.0))
.cursor_pointer()
.hover(|style| style.opacity(0.94))
.active(|style| style.opacity(0.85))
.on_click(cx.listener(move |shell, _, _, cx| {
shell.set_active_sidebar_width(mode.width(), cx);
}))
.child(render_layout_preview(mode))
.child(
div()
.flex()
.flex_col()
.gap(px(2.0))
.child(
div()
.text_size(px(12.5))
.font_weight(FontWeight(500.0))
.text_color(rgb(colors::ink()))
.child(title),
)
.child(div().text_size(px(11.0)).text_color(rgb(colors::ink_4())).child(detail)),
)
.into_any_element()
}
fn render_layout_preview(mode: LayoutMode) -> AnyElement {
let sidebar_width = mode.preview_sidebar();
div()
.h(px(96.0))
.rounded(px(8.0))
.bg(rgb(0xffffff))
.relative()
.child(
div()
.absolute()
.left(px(6.0))
.top(px(6.0))
.bottom(px(6.0))
.w(px(sidebar_width))
.rounded(px(5.0))
.bg(rgba(layout_panel_bg())),
)
.child(
div()
.absolute()
.left(px(sidebar_width + 12.0))
.top(px(6.0))
.right(px(6.0))
.bottom(px(6.0))
.rounded(px(5.0))
.bg(rgba(layout_canvas_bg())),
)
.into_any_element()
}
fn layout_card_bg() -> u32 {
colors::pick(0xffffffd9, 0x1f1d1bd9)
}
fn layout_panel_bg() -> u32 {
colors::pick(0x281e1414, 0xf2efe914)
}
fn layout_canvas_bg() -> u32 {
colors::pick(0x281e140a, 0xf2efe90a)
}
crates/ely_app/src/shell/chrome/mod.rs
-1
View File
@@ -1,6 +1,5 @@
pub(crate) mod animations;
pub(crate) mod appearance_form;
pub(crate) mod appearance_layout_cards;
pub(crate) mod brand_glyph;
pub(crate) mod command_footer;
pub(crate) mod command_match;