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
@@ -148,7 +148,7 @@ impl RenderOnce for NavigationMenu {
|
||||
.hover(|style| style.text_color(colors.fg))
|
||||
.on_mouse_down(MouseButton::Left, move |_, window, cx| {
|
||||
window.prevent_default();
|
||||
window.focus(&into);
|
||||
window.focus(&into, cx);
|
||||
show(&press, if on { None } else { Some(ix) }, cx);
|
||||
})
|
||||
.on_hover(move |hovered, _, cx| {
|
||||
|
||||
@@ -81,7 +81,7 @@ impl Render for QuickLauncher {
|
||||
.palette(window, cx);
|
||||
if !self.focused {
|
||||
self.focused = true;
|
||||
window.focus(&palette.input.read(cx).focus().clone());
|
||||
window.focus(&palette.input.read(cx).focus().clone(), cx);
|
||||
}
|
||||
div()
|
||||
.size_full()
|
||||
|
||||
@@ -153,7 +153,7 @@ impl Palette {
|
||||
let takeover = take_focus((self.id.clone(), "takeover"), window, cx);
|
||||
let scope = takeover.read(cx).focus.clone();
|
||||
if scope.is_focused(window) {
|
||||
window.focus(&self.input.read(cx).focus().clone());
|
||||
window.focus(&self.input.read(cx).focus().clone(), cx);
|
||||
}
|
||||
let close = self.on_close.clone();
|
||||
let close: Run = Rc::new(move |window, cx| {
|
||||
|
||||
@@ -261,7 +261,7 @@ fn search_refuses_disabled_results(cx: &mut TestAppContext) {
|
||||
fn enter_picks_on_release_so_the_opener_stays_shut(cx: &mut TestAppContext) {
|
||||
let (view, cx) = host(Kind::Commands, cx);
|
||||
press("escape", cx);
|
||||
cx.update(|window, _| window.focus_next());
|
||||
cx.update(|window, cx| window.focus_next(cx));
|
||||
press("enter", cx);
|
||||
assert_eq!(got(&view, cx), (true, None));
|
||||
cx.simulate_input("zi");
|
||||
|
||||
@@ -193,7 +193,7 @@ impl RenderOnce for Steps {
|
||||
.flex_1()
|
||||
.items_center()
|
||||
.gap_3()
|
||||
.when(ix + 1 == count, |step| step.flex_none())
|
||||
.when(ix + 1 == count, |step| step.flex_grow_0().flex_shrink_0())
|
||||
.child(head.child(circle).child(words))
|
||||
.children(after)
|
||||
.into_any_element()
|
||||
@@ -337,7 +337,7 @@ impl RenderOnce for Wizard {
|
||||
wizard.child(
|
||||
Steps::new((id.clone(), "steps"), self.steps, current).on_select(
|
||||
move |to, window, cx| {
|
||||
window.focus(&jumped);
|
||||
window.focus(&jumped, cx);
|
||||
jump(to, window, cx)
|
||||
},
|
||||
),
|
||||
@@ -355,7 +355,7 @@ impl RenderOnce for Wizard {
|
||||
.disabled(current == 0)
|
||||
.on_click(move |_, window, cx| {
|
||||
if current == 1 {
|
||||
window.focus(&to_advance);
|
||||
window.focus(&to_advance, cx);
|
||||
}
|
||||
back(current - 1, window, cx)
|
||||
}),
|
||||
|
||||
+25
-25
@@ -53,7 +53,7 @@ impl Render for Strip {
|
||||
fn tab_arrows_skip_disabled_tabs_and_wrap(cx: &mut TestAppContext) {
|
||||
setup(cx);
|
||||
let (view, cx) = cx.add_window_view(|_, _| Strip { chosen: "a".into() });
|
||||
cx.update(|window, _| window.focus_next());
|
||||
cx.update(|window, cx| window.focus_next(cx));
|
||||
cx.simulate_keystrokes("right");
|
||||
assert_eq!(view.read_with(cx, |view, _| view.chosen.clone()), "c");
|
||||
cx.simulate_keystrokes("right");
|
||||
@@ -90,9 +90,9 @@ impl Render for Path {
|
||||
fn a_level_lists_its_siblings_and_picks_one(cx: &mut TestAppContext) {
|
||||
setup(cx);
|
||||
let (view, cx) = cx.add_window_view(|_, _| Path { picked: None });
|
||||
cx.update(|window, _| {
|
||||
window.focus_next();
|
||||
window.focus_next();
|
||||
cx.update(|window, cx| {
|
||||
window.focus_next(cx);
|
||||
window.focus_next(cx);
|
||||
});
|
||||
press("down", cx);
|
||||
press("down", cx);
|
||||
@@ -132,13 +132,13 @@ fn the_wizard_walks_forward_back_and_finishes(cx: &mut TestAppContext) {
|
||||
step: 0,
|
||||
done: false,
|
||||
});
|
||||
cx.update(|window, _| window.focus_next());
|
||||
cx.update(|window, cx| window.focus_next(cx));
|
||||
press("enter", cx);
|
||||
assert_eq!(view.read_with(cx, |view, _| view.step), 1);
|
||||
cx.update(|window, _| {
|
||||
window.blur();
|
||||
window.focus_next();
|
||||
window.focus_next();
|
||||
cx.update(|window, cx| {
|
||||
window.blur(cx);
|
||||
window.focus_next(cx);
|
||||
window.focus_next(cx);
|
||||
});
|
||||
press("enter", cx);
|
||||
assert_eq!(view.read_with(cx, |view, _| view.step), 0);
|
||||
@@ -146,10 +146,10 @@ fn the_wizard_walks_forward_back_and_finishes(cx: &mut TestAppContext) {
|
||||
view.step = 2;
|
||||
cx.notify();
|
||||
});
|
||||
cx.update(|window, _| {
|
||||
window.blur();
|
||||
cx.update(|window, cx| {
|
||||
window.blur(cx);
|
||||
for _ in 0..4 {
|
||||
window.focus_next();
|
||||
window.focus_next(cx);
|
||||
}
|
||||
});
|
||||
press("enter", cx);
|
||||
@@ -164,9 +164,9 @@ fn a_picked_step_hands_focus_to_next(cx: &mut TestAppContext) {
|
||||
step: 2,
|
||||
done: false,
|
||||
});
|
||||
cx.update(|window, _| {
|
||||
window.blur();
|
||||
window.focus_next();
|
||||
cx.update(|window, cx| {
|
||||
window.blur(cx);
|
||||
window.focus_next(cx);
|
||||
});
|
||||
press("enter", cx);
|
||||
assert_eq!(view.read_with(cx, |view, _| view.step), 0);
|
||||
@@ -305,7 +305,7 @@ impl Render for Site {
|
||||
fn the_menu_opens_switches_and_picks_from_the_keyboard(cx: &mut TestAppContext) {
|
||||
setup(cx);
|
||||
let (view, cx) = cx.add_window_view(|_, _| Site::new());
|
||||
cx.update(|window, _| window.focus_next());
|
||||
cx.update(|window, cx| window.focus_next(cx));
|
||||
cx.simulate_keystrokes("down right down enter");
|
||||
let went = view.read_with(cx, |view, _| view.went.clone());
|
||||
assert_eq!(went, Some(SharedString::from("api")));
|
||||
@@ -315,7 +315,7 @@ fn the_menu_opens_switches_and_picks_from_the_keyboard(cx: &mut TestAppContext)
|
||||
fn menu_keys_pass_over_disabled_links(cx: &mut TestAppContext) {
|
||||
setup(cx);
|
||||
let (view, cx) = cx.add_window_view(|_, _| Site::new());
|
||||
cx.update(|window, _| window.focus_next());
|
||||
cx.update(|window, cx| window.focus_next(cx));
|
||||
cx.simulate_keystrokes("down enter");
|
||||
let went = view.read_with(cx, |view, _| view.went.clone());
|
||||
assert_eq!(went, Some(SharedString::from("price")));
|
||||
@@ -328,7 +328,7 @@ fn menu_keys_pass_over_disabled_links(cx: &mut TestAppContext) {
|
||||
fn an_open_menu_follows_lists_that_shrink(cx: &mut TestAppContext) {
|
||||
setup(cx);
|
||||
let (view, cx) = cx.add_window_view(|_, _| Site::new());
|
||||
cx.update(|window, _| window.focus_next());
|
||||
cx.update(|window, cx| window.focus_next(cx));
|
||||
cx.simulate_keystrokes("down right down");
|
||||
view.update(cx, |view, cx| {
|
||||
view.entries[1].1.pop();
|
||||
@@ -369,13 +369,13 @@ impl Render for Trail {
|
||||
fn back_steps_once_and_the_list_jumps_anywhere(cx: &mut TestAppContext) {
|
||||
setup(cx);
|
||||
let (view, cx) = cx.add_window_view(|_, _| Trail { at: 2 });
|
||||
cx.update(|window, _| window.focus_next());
|
||||
cx.update(|window, cx| window.focus_next(cx));
|
||||
press("enter", cx);
|
||||
assert_eq!(view.read_with(cx, |view, _| view.at), 1);
|
||||
cx.update(|window, _| {
|
||||
window.blur();
|
||||
cx.update(|window, cx| {
|
||||
window.blur(cx);
|
||||
for _ in 0..3 {
|
||||
window.focus_next();
|
||||
window.focus_next(cx);
|
||||
}
|
||||
});
|
||||
press("down", cx);
|
||||
@@ -405,7 +405,7 @@ fn enter_jumps_to_a_line_and_column(cx: &mut TestAppContext) {
|
||||
field: cx.new(|cx| TextInput::new(window, cx)),
|
||||
to: None,
|
||||
});
|
||||
cx.update(|window, _| window.focus_next());
|
||||
cx.update(|window, cx| window.focus_next(cx));
|
||||
cx.simulate_input("12:4");
|
||||
cx.simulate_keystrokes("enter");
|
||||
assert_eq!(view.read_with(cx, |view, _| view.to), Some((12, Some(4))));
|
||||
@@ -435,7 +435,7 @@ fn load_more_asks_once_per_press_and_goes_once_all_show(cx: &mut TestAppContext)
|
||||
shown: 10,
|
||||
asks: 0,
|
||||
});
|
||||
cx.update(|window, _| window.focus_next());
|
||||
cx.update(|window, cx| window.focus_next(cx));
|
||||
press("enter", cx);
|
||||
assert_eq!(view.read_with(cx, |more, _| more.asks), 1);
|
||||
view.update(cx, |more, cx| {
|
||||
@@ -449,7 +449,7 @@ fn load_more_asks_once_per_press_and_goes_once_all_show(cx: &mut TestAppContext)
|
||||
more.shown = 30;
|
||||
cx.notify();
|
||||
});
|
||||
cx.update(|window, _| window.focus_next());
|
||||
cx.update(|window, cx| window.focus_next(cx));
|
||||
press("enter", cx);
|
||||
assert_eq!(
|
||||
view.read_with(cx, |more, _| more.asks),
|
||||
|
||||
@@ -131,7 +131,7 @@ impl RenderOnce for TableOfContents {
|
||||
let (viewport, at_end, tops) = {
|
||||
let sections = self.sections.read(cx);
|
||||
let (scroll, viewport) = (§ions.scroll, sections.scroll.bounds());
|
||||
let room = scroll.max_offset().height;
|
||||
let room = scroll.max_offset().y;
|
||||
let at_end = room > Pixels::ZERO && -scroll.offset().y >= room;
|
||||
let tops: Vec<Option<Pixels>> = self
|
||||
.entries
|
||||
|
||||
Reference in new issue
Block a user