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.

src/tooling/events.rs

@@ -7,9 +7,9 @@ use std::{
 
 use gpui::{
     AnyElement, App, DispatchPhase, ElementId, InteractiveElement, IntoElement, KeyContext,
-    Modifiers, MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent, ParentElement, Pixels,
-    Point, RenderOnce, ScrollDelta, ScrollWheelEvent, StatefulInteractiveElement, Styled, Window,
-    canvas, div, prelude::FluentBuilder,
+    Keystroke, Modifiers, MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent, ParentElement,
+    Pixels, Point, RenderOnce, ScrollDelta, ScrollWheelEvent, StatefulInteractiveElement, Styled,
+    Window, canvas, div, prelude::FluentBuilder,
 };
 use smallvec::SmallVec;
 
@@ -43,6 +43,12 @@ fn button(button: MouseButton) -> String {
     format!("{button:?}").to_lowercase()
 }
 
+/// The key gpui makes of a modifier pressed and released alone; the log shows it as modifiers.
+fn lone_modifier(keystroke: &Keystroke) -> bool {
+    let names = ["shift", "control", "alt", "platform", "function"];
+    !keystroke.modifiers.modified() && names.contains(&keystroke.key.as_str())
+}
+
 impl fmt::Display for Seen {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
@@ -158,7 +164,7 @@ impl RenderOnce for EventLogger {
                         .context_stack
                         .iter()
                         .any(|context| context.get("logger").is_some_and(|logger| *logger == mark));
-                    if inside {
+                    if inside && !lone_modifier(&event.keystroke) {
                         down(Seen::KeyDown(event.keystroke.unparse()), cx)
                     }
                 })

src/tooling/inspector.rs

@@ -3,8 +3,8 @@ use std::fmt;
 use gpui::{
     AbsoluteLength, AnyElement, App, BorderStyle, Bounds, Context, Corners, DefiniteLength,
     DivInspectorState, Edges, FontWeight, Inspector, InteractiveElement, IntoElement, Length,
-    ParentElement, Pixels, StatefulInteractiveElement, StyleRefinement, Styled, TextRun, Window,
-    canvas, div, fill, point, quad, size, transparent_black,
+    ParentElement, Pixels, StatefulInteractiveElement, StyleRefinement, Styled, TextAlign, TextRun,
+    Window, canvas, div, fill, point, quad, size, transparent_black,
 };
 
 use crate::{
@@ -156,7 +156,14 @@ fn paint_layers(bounds: Bounds<Pixels>, layers: Layers, window: &mut Window, cx:
     );
     let radius = theme.radius(Radius::Sm).to_pixels(window.rem_size());
     window.paint_quad(fill(tag, colors.fg).corner_radii(radius));
-    if let Err(error) = line.paint(point(tag.left() + pad, tag.top()), height, window, cx) {
+    if let Err(error) = line.paint(
+        point(tag.left() + pad, tag.top()),
+        height,
+        TextAlign::Left,
+        None,
+        window,
+        cx,
+    ) {
         log::error!("inspector: size tag did not paint: {error:#}");
     }
 }
@@ -380,8 +387,10 @@ fn panel(
 /// Draws gpui's inspector, which debug builds have, in Ely's look. `window.toggle_inspector` opens it at the window's right, and the page gives up its width. Hovering picks the box under the pointer, the wheel steps out to the boxes around it, and a press holds it; the picked box shows its margin, border, padding and size over the page, and its model in the panel.
 pub fn install_inspector(cx: &mut App) {
     cx.set_inspector_renderer(Box::new(panel));
-    cx.register_inspector_element(|_, state: &DivInspectorState, window, cx| {
-        box_model(state, window, cx)
+    cx.register_inspector_element(|_, _| {
+        |_, state: &DivInspectorState, window: &mut Window, cx: &mut App| {
+            box_model(state, window, cx)
+        }
     });
     log::info!("inspector: installed");
 }

src/tooling/tests/inspection.rs

@@ -120,7 +120,7 @@ fn tab_passes_through_the_panel(cx: &mut TestAppContext) {
         )
     });
     cx.update(|window, cx| {
-        window.focus(&root);
+        window.focus(&root, cx);
         window.toggle_inspector(cx);
     });
     cx.run_until_parked();
@@ -227,7 +227,7 @@ fn the_logger_lists_events(cx: &mut TestAppContext) {
         field: cx.new(|cx| TextInput::new(window, cx)),
     });
     let target = view.read_with(cx, |logged, _| logged.target.clone());
-    cx.update(|window, _| window.focus(&target));
+    cx.update(|window, cx| window.focus(&target, cx));
     cx.run_until_parked();
     assert!(shown("event-logger-empty", cx));
     cx.simulate_mouse_move(point(px(20.0), px(20.0)), None, Modifiers::none());
@@ -257,10 +257,16 @@ fn the_logger_lists_events(cx: &mut TestAppContext) {
     assert!(shown("event-key up a", cx));
     cx.simulate_modifiers_change(Modifiers::shift());
     assert!(shown("event-modifiers shift", cx));
+    cx.simulate_modifiers_change(Modifiers::none());
+    assert!(shown("event-modifiers none", cx));
+    assert!(
+        !shown("event-key down shift", cx),
+        "a lone modifier is no key"
+    );
     let (field, root) = view.read_with(cx, |logged, cx| {
         (logged.field.focus_handle(cx), logged.root.clone())
     });
-    cx.update(|window, _| window.focus(&field));
+    cx.update(|window, cx| window.focus(&field, cx));
     for key in ["b", "c", "backspace", "left", "enter"] {
         press(key, cx);
     }
@@ -273,7 +279,7 @@ fn the_logger_lists_events(cx: &mut TestAppContext) {
     ] {
         assert!(shown(row, cx), "{row}: a key the field's bindings take");
     }
-    cx.update(|window, _| window.focus(&root));
+    cx.update(|window, cx| window.focus(&root, cx));
     press("z", cx);
     assert!(
         !shown("event-key down z", cx),

src/tooling/tests/mod.rs

@@ -93,7 +93,7 @@ fn knobs_redraw_the_preview(cx: &mut TestAppContext) {
         root: cx.focus_handle(),
     });
     let root = view.read_with(cx, |stage, _| stage.root.clone());
-    cx.update(|window, _| window.focus(&root));
+    cx.update(|window, cx| window.focus(&root, cx));
     settle(cx);
     let shown =
         |selector: &'static str, cx: &mut VisualTestContext| cx.debug_bounds(selector).is_some();