Port · Build: Zed's gpui at 1a28cff

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.
This commit is contained in:
ZacharyZhang-NY committed 2026-09-28 20:30:17 -04:00
1 parent 25b8a6f22c
commit 4c3ed1bbb9
199 files changed
+2513 -2643

No files matched your search

+1 -1
View File
@@ -107,7 +107,7 @@ impl RenderOnce for Dialog {
if let Some(first) = &self.first
&& focus.is_focused(window)
{
window.focus(first);
window.focus(first, cx);
}
let close: Run = {
let (id, on_close) = (self.id.clone(), self.on_close);
+2 -2
View File
@@ -1,7 +1,7 @@
use std::rc::Rc;
use gpui::{
AnimationExt, AnyElement, App, Corner, ElementId, Entity, FontWeight, InteractiveElement,
Anchor, AnimationExt, AnyElement, App, ElementId, Entity, FontWeight, InteractiveElement,
IntoElement, ParentElement, RenderOnce, SharedString, Styled, Window, anchored, canvas, div,
point, prelude::*,
};
@@ -72,7 +72,7 @@ impl RenderOnce for FloatingToolbar {
(self.id.clone(), "raised"),
anchored()
.position(anchor.origin - point(gpui::Pixels::ZERO, lift))
.anchor(Corner::BottomLeft)
.anchor(Anchor::BottomLeft)
.snap_to_window()
.child(
surface((self.id.clone(), "bar"), cx)
+5 -2
View File
@@ -1,8 +1,9 @@
use std::{rc::Rc, time::Duration};
use gpui::{
AnyElement, App, Bounds, ElementId, Entity, InteractiveElement, IntoElement, ParentElement,
Pixels, RenderOnce, StatefulInteractiveElement, Styled, Task, Window, canvas, div,
AnyElement, App, Bounds, ElementId, Entity, HoverListenerMode, InteractiveElement, IntoElement,
ParentElement, Pixels, RenderOnce, StatefulInteractiveElement, Styled, Task, Window, canvas,
div,
};
use crate::forms::{float_height, surface};
@@ -78,6 +79,7 @@ impl RenderOnce for HoverCard {
.id(self.id.clone())
.relative()
.child(self.trigger)
.hover_listener_mode(HoverListenerMode::InputModalityIndependent)
.on_hover(move |hovered, window, cx| {
enter.update(cx, |hover, _| hover.on_trigger = *hovered);
settle_after(&enter, if *hovered { OPEN } else { LINGER }, window, cx);
@@ -108,6 +110,7 @@ impl RenderOnce for HoverCard {
.relative()
.occlude()
.p_4()
.hover_listener_mode(HoverListenerMode::InputModalityIndependent)
.on_hover(move |hovered, window, cx| {
over.update(cx, |hover, _| hover.on_card = *hovered);
settle_after(&over, LINGER, window, cx);
+7 -7
View File
@@ -141,7 +141,7 @@ fn guides(cx: &mut TestAppContext) -> (Entity<Guides>, &mut VisualTestContext) {
fn open(view: &Entity<Guides>, which: Open, cx: &mut VisualTestContext) {
let before = view.read_with(cx, |guides, _| guides.before.clone());
cx.update(|window, _| window.focus(&before));
cx.update(|window, cx| window.focus(&before, cx));
view.update(cx, |guides, cx| {
guides.open = Some(which);
guides.at = 0;
@@ -242,7 +242,7 @@ fn the_toolbar_floats_over_a_selection_only(cx: &mut TestAppContext) {
let (view, cx) = guides(cx);
let field = view.read_with(cx, |guides, _| guides.field.clone());
let focus = field.read_with(cx, |input, _| input.focus().clone());
cx.update(|window, _| window.focus(&focus));
cx.update(|window, cx| window.focus(&focus, cx));
settle(cx);
let start = field
.read_with(cx, |input, _| input.bounds_for(0))
@@ -253,7 +253,7 @@ fn the_toolbar_floats_over_a_selection_only(cx: &mut TestAppContext) {
);
click(bold.0, bold.1, cx);
assert!(state(&view, cx).2.is_empty(), "no selection, no toolbar");
cx.update(|window, _| window.focus(&focus));
cx.update(|window, cx| window.focus(&focus, cx));
press("secondary-a", cx);
click(bold.0, bold.1, cx);
assert_eq!(state(&view, cx).2, ["bold"]);
@@ -263,10 +263,10 @@ fn the_toolbar_floats_over_a_selection_only(cx: &mut TestAppContext) {
fn the_peek_closes_from_its_button(cx: &mut TestAppContext) {
let (view, cx) = guides(cx);
open(&view, Open::Peek, cx);
cx.update(|window, _| {
window.blur();
cx.update(|window, cx| {
window.blur(cx);
for _ in 0..3 {
window.focus_next();
window.focus_next(cx);
}
});
press("enter", cx);
@@ -309,7 +309,7 @@ fn the_toolbar_follows_its_field(cx: &mut TestAppContext) {
let (view, cx) = guides(cx);
let field = view.read_with(cx, |guides, _| guides.field.clone());
let focus = field.read_with(cx, |input, _| input.focus().clone());
cx.update(|window, _| window.focus(&focus));
cx.update(|window, cx| window.focus(&focus, cx));
press("secondary-a", cx);
view.update(cx, |guides, cx| {
guides.lower = true;
+3 -3
View File
@@ -198,7 +198,7 @@ fn log(view: &Entity<Stage>, cx: &mut VisualTestContext) -> Vec<String> {
fn show(view: &Entity<Stage>, open: Open, cx: &mut VisualTestContext) {
let before = view.read_with(cx, |stage, _| stage.before.clone());
cx.update(|window, _| window.focus(&before));
cx.update(|window, cx| window.focus(&before, cx));
view.update(cx, |stage, cx| {
stage.open = Some(open);
cx.notify();
@@ -209,7 +209,7 @@ fn show(view: &Entity<Stage>, open: Open, cx: &mut VisualTestContext) {
#[gpui::test]
fn tab_walks_inside_an_open_popover(cx: &mut TestAppContext) {
let (view, cx) = stage(cx);
cx.update(|window, _| window.focus_next());
cx.update(|window, cx| window.focus_next(cx));
press("enter", cx);
for _ in 0..3 {
press("tab", cx);
@@ -221,7 +221,7 @@ fn tab_walks_inside_an_open_popover(cx: &mut TestAppContext) {
#[gpui::test]
fn escape_closes_the_popover_and_hands_focus_back(cx: &mut TestAppContext) {
let (view, cx) = stage(cx);
cx.update(|window, _| window.focus_next());
cx.update(|window, cx| window.focus_next(cx));
press("enter", cx);
press("escape", cx);
press("enter", cx);