ZacharyZhang-NYandClaude Opus 5.5
94deeaed52
gpui and gpui_platform now come from Zed's repo by git at 1a28cff, the code gpui-pre 0.3.7 republishes, so the gallery can later build for the browser. gpui takes stacker, as 0.2.2 always did, and gpui_platform takes font-kit, without which macOS draws no text; runtime_shaders moves to gpui_platform. The API moved: focus, blur and Tab steps take cx, Corner is Anchor, shaped lines paint with an alignment, defer_draw takes a content mask, the inspector registers a factory, async updates return their value, and wrapped lines are shared, not cloned. Updates through a window context go through the window, so a closed window still ends them as it did. Where the new gpui behaves differently, Ely keeps its old intent. Holds and reveals under a resting pointer survive typing through gpui's input-modality-independent hover; previews the keyboard also moves keep the default, and the calendar's leave ignores a key press. Enter reaches a button inside the code editor, since gpui now arms a key click on the press. The event logger skips a lone modifier. A video and an image grid keep their shape in a flex column under taffy 0.13, as a picture does. AGENTS.md records the new stack and the rules this port changes; the rest of the old gpui and taffy rules are re-tested in T44c. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
292 lines
11 KiB
Rust
292 lines
11 KiB
Rust
use ely_gpui_component::{
|
|
buttons::{ButtonVariant, IconButton},
|
|
layout::on_axis,
|
|
primitives::{FocusScope, IconName},
|
|
theme::{ActiveTheme, ControlSize, Mode, Radius, TextSize, Theme},
|
|
};
|
|
use gpui::{
|
|
AnyElement, App, Bounds, Context, FocusHandle, FontWeight, InteractiveElement, IntoElement,
|
|
ParentElement, Pixels, Render, ScrollHandle, SharedString, StatefulInteractiveElement, Styled,
|
|
Subscription, Window, div, point, prelude::*, px,
|
|
};
|
|
|
|
use crate::pages;
|
|
|
|
#[derive(Clone, Copy, PartialEq, Eq)]
|
|
pub enum Choice {
|
|
Light,
|
|
Dark,
|
|
System,
|
|
}
|
|
|
|
pub struct Gallery {
|
|
page: usize,
|
|
/// Counts fresh starts; the page's state lives under it.
|
|
pass: usize,
|
|
choice: Choice,
|
|
focus: FocusHandle,
|
|
scroll: ScrollHandle,
|
|
/// Narrow check width, if any.
|
|
narrow: Option<Pixels>,
|
|
_appearance: Subscription,
|
|
}
|
|
|
|
impl Gallery {
|
|
pub fn new(
|
|
page: usize,
|
|
narrow: Option<f32>,
|
|
window: &mut Window,
|
|
cx: &mut Context<Self>,
|
|
) -> Self {
|
|
let appearance = cx.observe_window_appearance(window, |gallery, window, cx| {
|
|
if gallery.choice == Choice::System {
|
|
Theme::set_mode(window.appearance().into(), cx);
|
|
}
|
|
});
|
|
let focus = cx.focus_handle();
|
|
window.focus(&focus, cx);
|
|
Self {
|
|
page,
|
|
pass: 0,
|
|
choice: Choice::Light,
|
|
focus,
|
|
scroll: ScrollHandle::new(),
|
|
narrow: narrow.map(px),
|
|
_appearance: appearance,
|
|
}
|
|
}
|
|
|
|
pub fn select(&mut self, page: usize, cx: &mut Context<Self>) {
|
|
log::info!("gallery: page -> {}", pages::ALL[page].slug);
|
|
self.page = page;
|
|
self.scroll.set_offset(point(px(0.0), px(0.0)));
|
|
cx.notify();
|
|
}
|
|
|
|
/// Drops the page's state, so it draws as new.
|
|
pub fn fresh(&mut self, cx: &mut Context<Self>) {
|
|
self.pass += 1;
|
|
cx.notify();
|
|
}
|
|
|
|
/// Viewport height and furthest scroll, in pixels.
|
|
pub fn scroll_extent(&self) -> (Pixels, Pixels) {
|
|
(self.scroll.bounds().size.height, self.scroll.max_offset().y)
|
|
}
|
|
|
|
/// Scrolls until `target` sits inside the page. True if it moved.
|
|
pub fn reveal(&mut self, target: Bounds<Pixels>, cx: &mut Context<Self>) -> bool {
|
|
let (view, margin) = (self.scroll.bounds(), px(96.0));
|
|
let shift = if target.top() < view.top() + margin {
|
|
target.top() - view.top() - margin
|
|
} else if target.bottom() > view.bottom() - margin {
|
|
target.bottom() - view.bottom() + margin
|
|
} else {
|
|
return false;
|
|
};
|
|
let y = (-self.scroll.offset().y + shift).clamp(px(0.0), self.scroll.max_offset().y);
|
|
self.scroll_to(y, cx);
|
|
true
|
|
}
|
|
|
|
pub fn scroll_to(&mut self, y: Pixels, cx: &mut Context<Self>) {
|
|
self.scroll.set_offset(point(px(0.0), -y));
|
|
cx.notify();
|
|
}
|
|
|
|
pub fn choose(&mut self, choice: Choice, window: &mut Window, cx: &mut Context<Self>) {
|
|
self.choice = choice;
|
|
let mode = match choice {
|
|
Choice::Light => Mode::Light,
|
|
Choice::Dark => Mode::Dark,
|
|
Choice::System => window.appearance().into(),
|
|
};
|
|
Theme::set_mode(mode, cx);
|
|
cx.notify();
|
|
}
|
|
|
|
fn sidebar(&self, cx: &mut Context<Self>) -> impl IntoElement + use<> {
|
|
let theme = cx.theme();
|
|
let colors = &theme.colors;
|
|
div()
|
|
.flex()
|
|
.flex_col()
|
|
.flex_none()
|
|
.w(px(248.0))
|
|
.h_full()
|
|
.pt(px(56.0))
|
|
.px_3()
|
|
.border_r_1()
|
|
.border_color(colors.border)
|
|
.child(
|
|
div()
|
|
.px_3()
|
|
.pb_6()
|
|
.child(
|
|
div()
|
|
.text_size(theme.text_size(TextSize::Lg))
|
|
.font_weight(FontWeight::SEMIBOLD)
|
|
.text_color(colors.fg)
|
|
.child("Ely"),
|
|
)
|
|
.child(
|
|
div()
|
|
.text_size(theme.text_size(TextSize::Sm))
|
|
.text_color(colors.fg_subtle)
|
|
.child("GPUI Component"),
|
|
),
|
|
)
|
|
.child(
|
|
on_axis(div().id("nav"))
|
|
.flex()
|
|
.flex_col()
|
|
.gap_0p5()
|
|
.overflow_y_scroll()
|
|
.children(pages::ALL.iter().enumerate().map(|(ix, page)| {
|
|
let selected = ix == self.page;
|
|
div()
|
|
.id(page.slug)
|
|
.flex()
|
|
.items_center()
|
|
.gap_3()
|
|
.h(px(30.0))
|
|
.px_3()
|
|
.rounded(theme.radius(Radius::Md))
|
|
.cursor_pointer()
|
|
.text_size(theme.text_size(TextSize::Base))
|
|
.text_color(if selected { colors.fg } else { colors.fg_muted })
|
|
.when(selected, |el| el.bg(colors.hover))
|
|
.hover(|style| style.bg(colors.hover).text_color(colors.fg))
|
|
.child(
|
|
div()
|
|
.w(px(18.0))
|
|
.font_family(theme.mono_family.clone())
|
|
.text_size(theme.text_size(TextSize::Xs))
|
|
.text_color(colors.fg_subtle)
|
|
.child(SharedString::from(format!("{:02}", page.number))),
|
|
)
|
|
.child(page.title)
|
|
.on_click(cx.listener(move |gallery, _, _, cx| gallery.select(ix, cx)))
|
|
})),
|
|
)
|
|
}
|
|
|
|
fn switcher(&self, cx: &mut Context<Self>) -> impl IntoElement + use<> {
|
|
let options = [
|
|
(Choice::Light, IconName::Sun, "theme-light"),
|
|
(Choice::Dark, IconName::Moon, "theme-dark"),
|
|
(Choice::System, IconName::Monitor, "theme-system"),
|
|
];
|
|
let colors = &cx.theme().colors;
|
|
div()
|
|
.flex_none()
|
|
.flex()
|
|
.gap_0p5()
|
|
.p_0p5()
|
|
.rounded(cx.theme().radius(Radius::Lg))
|
|
.border_1()
|
|
.border_color(colors.border)
|
|
.children(options.map(|(choice, icon, id)| {
|
|
let variant = if choice == self.choice {
|
|
ButtonVariant::Subtle
|
|
} else {
|
|
ButtonVariant::Ghost
|
|
};
|
|
IconButton::new(id, icon)
|
|
.variant(variant)
|
|
.size(ControlSize::Sm)
|
|
.on_click(
|
|
cx.listener(move |gallery, _, window, cx| {
|
|
gallery.choose(choice, window, cx)
|
|
}),
|
|
)
|
|
}))
|
|
}
|
|
}
|
|
|
|
impl Gallery {
|
|
/// Header and body; a padded card when narrow.
|
|
fn card(&self, header: impl IntoElement, body: AnyElement, cx: &App) -> AnyElement {
|
|
let content = div().child(header).child(body);
|
|
match self.narrow {
|
|
// Width plus padding and hairlines.
|
|
Some(width) => div()
|
|
.w(width + px(34.0))
|
|
.p_4()
|
|
.border_1()
|
|
.border_color(cx.theme().colors.border)
|
|
.child(content)
|
|
.into_any_element(),
|
|
None => content.into_any_element(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Render for Gallery {
|
|
fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
|
|
let page = &pages::ALL[self.page];
|
|
let body = window.with_id(("pass", self.pass), |window| (page.render)(window, cx));
|
|
let sidebar = self.sidebar(cx);
|
|
let switcher = self.switcher(cx);
|
|
let theme = cx.theme();
|
|
let colors = &theme.colors;
|
|
|
|
FocusScope::new(&self.focus)
|
|
.root()
|
|
.size_full()
|
|
.flex()
|
|
.bg(colors.bg)
|
|
.text_color(colors.fg)
|
|
.font_family(theme.font_family.clone())
|
|
.text_size(theme.text_size(TextSize::Base))
|
|
.child(sidebar)
|
|
.child(
|
|
on_axis(div().id(("page", self.pass)))
|
|
.flex_1()
|
|
.h_full()
|
|
.overflow_y_scroll()
|
|
.track_scroll(&self.scroll)
|
|
.child(
|
|
div()
|
|
.max_w(px(960.0))
|
|
.px(px(56.0))
|
|
.pt(px(56.0))
|
|
.pb(px(96.0))
|
|
.child(
|
|
self.card(
|
|
div()
|
|
.flex()
|
|
.flex_wrap()
|
|
.items_start()
|
|
.justify_between()
|
|
.gap_6()
|
|
.child(
|
|
div()
|
|
.flex_1()
|
|
.min_w(px(200.0))
|
|
.flex()
|
|
.flex_col()
|
|
.gap_2()
|
|
.child(
|
|
div()
|
|
.text_size(theme.text_size(TextSize::Xxl))
|
|
.font_weight(FontWeight::SEMIBOLD)
|
|
.child(page.title),
|
|
)
|
|
.child(
|
|
div()
|
|
.text_size(theme.text_size(TextSize::Md))
|
|
.text_color(colors.fg_muted)
|
|
.child(page.summary),
|
|
),
|
|
)
|
|
.child(switcher),
|
|
body,
|
|
cx,
|
|
),
|
|
),
|
|
),
|
|
)
|
|
}
|
|
}
|