ZacharyZhang-NY
4c3ed1bbb9
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.
71 lines
2.3 KiB
Rust
71 lines
2.3 KiB
Rust
use gpui::{
|
|
App, ElementId, FocusHandle, InteractiveElement, IntoElement, ParentElement, RenderOnce,
|
|
SharedString, StatefulInteractiveElement, Styled, Window, anchored, div, prelude::*,
|
|
};
|
|
|
|
use crate::{
|
|
primitives::{raise, tab_stop},
|
|
theme::{ActiveTheme, Elevation, Radius, TextSize},
|
|
};
|
|
|
|
/// A link that shows only while focused and hands focus to `target`. Put it before what a keyboard would otherwise tab through, such as a long nav; it takes no room at rest and lies over the page while shown.
|
|
#[derive(IntoElement)]
|
|
pub struct SkipLink {
|
|
id: ElementId,
|
|
label: SharedString,
|
|
target: FocusHandle,
|
|
}
|
|
|
|
impl SkipLink {
|
|
pub fn new(
|
|
id: impl Into<ElementId>,
|
|
label: impl Into<SharedString>,
|
|
target: &FocusHandle,
|
|
) -> Self {
|
|
Self {
|
|
id: id.into(),
|
|
label: label.into(),
|
|
target: target.clone(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl RenderOnce for SkipLink {
|
|
fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
|
|
let handle = tab_stop(self.id.clone(), true, window, cx);
|
|
let shown = handle.is_focused(window);
|
|
let theme = cx.theme();
|
|
let (target, label) = (self.target, self.label.clone());
|
|
let skip = move |window: &mut Window, cx: &mut App| {
|
|
log::info!("skip link {label:?}: focus to its target");
|
|
window.focus(&target, cx);
|
|
};
|
|
let press = skip.clone();
|
|
let pill = div()
|
|
.id((self.id.clone(), "pill"))
|
|
.occlude()
|
|
.px_3()
|
|
.py_1p5()
|
|
.rounded(theme.radius(Radius::Md))
|
|
.bg(theme.colors.overlay)
|
|
.border_1()
|
|
.border_color(theme.colors.focus)
|
|
.shadow(theme.elevation(Elevation::Floating))
|
|
.text_size(theme.text_size(TextSize::Sm))
|
|
.text_color(theme.colors.fg)
|
|
.cursor_pointer()
|
|
.child(self.label)
|
|
.on_click(move |_, window, cx| press(window, cx));
|
|
div()
|
|
.id(self.id.clone())
|
|
.track_focus(&handle)
|
|
.on_click(move |_, window, cx| skip(window, cx))
|
|
.when(shown, |link| {
|
|
link.child(raise(
|
|
self.id.clone(),
|
|
anchored().snap_to_window().child(div().p_2().child(pill)),
|
|
))
|
|
})
|
|
}
|
|
}
|