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
-1
@@ -259,7 +259,7 @@ impl RenderOnce for SelectableList {
|
||||
(false, true) => Pick::Toggle,
|
||||
_ => Pick::One,
|
||||
};
|
||||
window.focus(&focus);
|
||||
window.focus(&focus, cx);
|
||||
pick(ix, how, window, cx);
|
||||
if event.click_count() == 2 {
|
||||
activate(&key, window, cx);
|
||||
|
||||
@@ -26,7 +26,7 @@ impl Render for Handoff {
|
||||
SelectableList::new("handoff")
|
||||
.row("a", ListItem::new("handoff-a", "A"))
|
||||
.on_activate(move |_, window, cx| {
|
||||
window.focus(&to);
|
||||
window.focus(&to, cx);
|
||||
opened.update(cx, |view, _| view.heard.push("open"));
|
||||
}),
|
||||
)
|
||||
@@ -49,7 +49,7 @@ fn an_open_that_moves_focus_leaves_the_release_alone(cx: &mut TestAppContext) {
|
||||
heard: Vec::new(),
|
||||
});
|
||||
settle(cx);
|
||||
cx.update(|window, _| window.focus_next());
|
||||
cx.update(|window, cx| window.focus_next(cx));
|
||||
settle(cx);
|
||||
enter(cx);
|
||||
settle(cx);
|
||||
@@ -66,7 +66,7 @@ impl Render for Relay {
|
||||
fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
|
||||
let opened = cx.entity();
|
||||
div()
|
||||
.capture_action(|_: &Enter, window, _| window.focus_next())
|
||||
.capture_action(|_: &Enter, window, cx| window.focus_next(cx))
|
||||
.child(Input::new(&self.field))
|
||||
.child(
|
||||
SelectableList::new("relay")
|
||||
@@ -88,7 +88,7 @@ fn a_release_that_began_elsewhere_opens_nothing(cx: &mut TestAppContext) {
|
||||
heard: Vec::new(),
|
||||
});
|
||||
settle(cx);
|
||||
cx.update(|window, _| window.focus_next());
|
||||
cx.update(|window, cx| window.focus_next(cx));
|
||||
settle(cx);
|
||||
enter(cx);
|
||||
settle(cx);
|
||||
@@ -131,6 +131,7 @@ fn a_letter_with_command_stays_a_shortcut(cx: &mut TestAppContext) {
|
||||
key_char: Some("a".into()),
|
||||
},
|
||||
is_held: false,
|
||||
prefer_character_input: false,
|
||||
});
|
||||
settle(cx);
|
||||
assert_eq!(picks(&view, cx), ["a", "b", "c", "d"]);
|
||||
|
||||
@@ -124,7 +124,7 @@ fn the_cursor_starts_on_the_first_selected_row(cx: &mut TestAppContext) {
|
||||
setup(cx);
|
||||
let (view, cx) = cx.add_window_view(|_, _| Picks(vec!["c".into()], Vec::new(), None, false));
|
||||
settle(cx);
|
||||
cx.update(|window, _| window.focus_next());
|
||||
cx.update(|window, cx| window.focus_next(cx));
|
||||
cx.simulate_keystrokes("down");
|
||||
settle(cx);
|
||||
assert_eq!(picks(&view, cx), ["d"]);
|
||||
@@ -137,7 +137,7 @@ fn a_selection_from_the_owner_moves_the_cursor_and_an_echo_does_not(cx: &mut Tes
|
||||
settle(cx);
|
||||
view.update(cx, |picks, _| picks.0 = vec!["b".into()]);
|
||||
settle(cx);
|
||||
cx.update(|window, _| window.focus_next());
|
||||
cx.update(|window, cx| window.focus_next(cx));
|
||||
cx.simulate_keystrokes("shift-down shift-down");
|
||||
settle(cx);
|
||||
assert_eq!(
|
||||
|
||||
@@ -180,7 +180,7 @@ impl RenderOnce for Tree {
|
||||
}
|
||||
if nav.read(cx).renaming.is_some() && editing.read(cx).field().is_none() {
|
||||
nav.update(cx, |nav, _| nav.renaming = None);
|
||||
window.focus(&focus);
|
||||
window.focus(&focus, cx);
|
||||
}
|
||||
let open: HashSet<SharedString> = opened.read(cx).value.iter().cloned().collect();
|
||||
let nodes = Rc::new(self.nodes);
|
||||
@@ -320,7 +320,7 @@ impl RenderOnce for Tree {
|
||||
let list = uniform_list((id.clone(), "rows"), count, move |range, window, cx| {
|
||||
draw(&data, range, window, cx)
|
||||
})
|
||||
.track_scroll(scroll)
|
||||
.track_scroll(&scroll)
|
||||
.size_full();
|
||||
self.base
|
||||
.id(self.id)
|
||||
|
||||
@@ -219,7 +219,7 @@ fn row(rows: &Rows, ix: usize, window: &mut Window, cx: &mut App) -> AnyElement
|
||||
}))
|
||||
.children(landing.filter(|at| *at != DropAt::Inside).map(line))
|
||||
.on_click(move |event, window, cx| {
|
||||
window.focus(&focus);
|
||||
window.focus(&focus, cx);
|
||||
if event.click_count() == 2 {
|
||||
activate(ix, window, cx);
|
||||
return;
|
||||
|
||||
Reference in new issue
Block a user