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:
1 parent
25b8a6f22c
commit
4c3ed1bbb9
199 files changed
+2513
-2643
No files matched your search
@@ -1,10 +1,10 @@
|
||||
use std::{collections::HashSet, rc::Rc};
|
||||
|
||||
use gpui::{
|
||||
App, Bounds, DragMoveEvent, ElementId, EmptyView, EntityId, InteractiveElement, IntoElement,
|
||||
MouseButton, ParentElement, Pixels, Point, RenderOnce, SharedString,
|
||||
StatefulInteractiveElement, Styled, Window, canvas, div, fill, point, prelude::*, size,
|
||||
transparent_black,
|
||||
App, Bounds, DragMoveEvent, ElementId, EmptyView, EntityId, HoverListenerMode,
|
||||
InteractiveElement, IntoElement, MouseButton, ParentElement, Pixels, Point, RenderOnce,
|
||||
SharedString, StatefulInteractiveElement, Styled, Window, canvas, div, fill, point, prelude::*,
|
||||
size, transparent_black,
|
||||
};
|
||||
|
||||
use super::lens::{DRAG, Lens, START, STEP, radius, turned};
|
||||
@@ -285,6 +285,7 @@ impl RenderOnce for EmbeddingVisualizer {
|
||||
})
|
||||
})
|
||||
})
|
||||
.hover_listener_mode(HoverListenerMode::InputModalityIndependent)
|
||||
.on_hover(move |inside, _, cx| {
|
||||
if !inside {
|
||||
left.update(cx, |view, cx| {
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
use std::rc::Rc;
|
||||
|
||||
use gpui::{
|
||||
App, Bounds, ElementId, Entity, InteractiveElement, IntoElement, ParentElement, Pixels, Point,
|
||||
RenderOnce, SharedString, StatefulInteractiveElement, Styled, Window, canvas, div, fill, point,
|
||||
prelude::*, size, transparent_black,
|
||||
App, Bounds, ElementId, Entity, HoverListenerMode, InteractiveElement, IntoElement,
|
||||
ParentElement, Pixels, Point, RenderOnce, SharedString, StatefulInteractiveElement, Styled,
|
||||
Window, canvas, div, fill, point, prelude::*, size, transparent_black,
|
||||
};
|
||||
|
||||
use crate::{
|
||||
@@ -336,6 +336,7 @@ impl RenderOnce for InpaintCanvas {
|
||||
cx.notify();
|
||||
})
|
||||
})
|
||||
.hover_listener_mode(HoverListenerMode::InputModalityIndependent)
|
||||
.on_hover(move |hovered, _, cx| {
|
||||
if !hovered {
|
||||
leave.update(cx, |pointer, cx| {
|
||||
|
||||
@@ -134,7 +134,7 @@ impl RenderOnce for PromptEnhancer {
|
||||
"prompt enhancer: suggestion {}",
|
||||
if taken { "taken" } else { "kept out" }
|
||||
);
|
||||
window.focus(&field.focus_handle(cx));
|
||||
window.focus(&field.focus_handle(cx), cx);
|
||||
if let Some(resolve) = &resolve {
|
||||
resolve(taken, window, cx);
|
||||
}
|
||||
|
||||
@@ -125,7 +125,7 @@ fn undo_waits_for_a_stroke(cx: &mut TestAppContext) {
|
||||
cx.notify();
|
||||
});
|
||||
settle(cx);
|
||||
cx.update(|window, _| window.blur());
|
||||
cx.update(|window, cx| window.blur(cx));
|
||||
tab(4, cx);
|
||||
press("enter", cx);
|
||||
assert_eq!(
|
||||
|
||||
@@ -192,7 +192,7 @@ fn run_waits_for_every_value_then_sends_the_filled_prompt(cx: &mut TestAppContex
|
||||
press("enter", cx);
|
||||
let ran = |cx: &mut VisualTestContext| view.read_with(cx, |view, _| view.ran.clone());
|
||||
assert!(ran(cx).is_empty(), "with tone blank, Run is out of reach");
|
||||
cx.update(|window, _| window.blur());
|
||||
cx.update(|window, cx| window.blur(cx));
|
||||
tab(3, cx);
|
||||
cx.simulate_input("calm");
|
||||
settle(cx);
|
||||
@@ -259,7 +259,7 @@ fn a_version_is_chosen_by_keys_and_only_an_older_one_restores(cx: &mut TestAppCo
|
||||
tab(4, cx);
|
||||
press("enter", cx);
|
||||
assert_eq!(heard(cx), (vec![], vec![]), "the newest offers no Restore");
|
||||
cx.update(|window, _| window.blur());
|
||||
cx.update(|window, cx| window.blur(cx));
|
||||
tab(2, cx);
|
||||
press("enter", cx);
|
||||
tab(2, cx);
|
||||
|
||||
@@ -27,7 +27,7 @@ fn press(key: &str, cx: &mut VisualTestContext) {
|
||||
|
||||
fn tab(times: usize, cx: &mut VisualTestContext) {
|
||||
for _ in 0..times {
|
||||
cx.update(|window, _| window.focus_next());
|
||||
cx.update(|window, cx| window.focus_next(cx));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user