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
@@ -296,7 +296,7 @@ pub(crate) fn hang(
|
||||
if let Some(typing) = &typing
|
||||
&& focus.is_focused(window)
|
||||
{
|
||||
window.focus(typing);
|
||||
window.focus(typing, cx);
|
||||
}
|
||||
let mut levels = state.read(cx).levels.clone();
|
||||
settle(menu, &mut levels);
|
||||
|
||||
+11
-11
@@ -136,7 +136,7 @@ fn click(x: f32, y: f32, cx: &mut VisualTestContext) {
|
||||
#[gpui::test]
|
||||
fn the_keyboard_opens_walks_past_disabled_rows_and_runs(cx: &mut TestAppContext) {
|
||||
let (view, cx) = desk(cx);
|
||||
cx.update(|window, _| window.focus_next());
|
||||
cx.update(|window, cx| window.focus_next(cx));
|
||||
press("enter", cx);
|
||||
press("down", cx);
|
||||
press("enter", cx);
|
||||
@@ -149,7 +149,7 @@ fn the_keyboard_opens_walks_past_disabled_rows_and_runs(cx: &mut TestAppContext)
|
||||
#[gpui::test]
|
||||
fn submenus_open_right_and_close_left(cx: &mut TestAppContext) {
|
||||
let (view, cx) = desk(cx);
|
||||
cx.update(|window, _| window.focus_next());
|
||||
cx.update(|window, cx| window.focus_next(cx));
|
||||
press("enter", cx);
|
||||
press("up", cx);
|
||||
press("right", cx);
|
||||
@@ -164,7 +164,7 @@ fn submenus_open_right_and_close_left(cx: &mut TestAppContext) {
|
||||
#[gpui::test]
|
||||
fn a_check_row_reports_to_its_owner(cx: &mut TestAppContext) {
|
||||
let (view, cx) = desk(cx);
|
||||
cx.update(|window, _| window.focus_next());
|
||||
cx.update(|window, cx| window.focus_next(cx));
|
||||
press("enter", cx);
|
||||
press("up", cx);
|
||||
press("up", cx);
|
||||
@@ -175,7 +175,7 @@ fn a_check_row_reports_to_its_owner(cx: &mut TestAppContext) {
|
||||
#[gpui::test]
|
||||
fn escape_backs_out_one_level_then_closes(cx: &mut TestAppContext) {
|
||||
let (view, cx) = desk(cx);
|
||||
cx.update(|window, _| window.focus_next());
|
||||
cx.update(|window, cx| window.focus_next(cx));
|
||||
press("enter", cx);
|
||||
press("up", cx);
|
||||
press("right", cx);
|
||||
@@ -230,7 +230,7 @@ fn the_trigger_toggles_and_a_press_outside_closes(cx: &mut TestAppContext) {
|
||||
#[gpui::test]
|
||||
fn rows_the_owner_removes_leave_the_menu_usable(cx: &mut TestAppContext) {
|
||||
let (view, cx) = desk(cx);
|
||||
cx.update(|window, _| window.focus_next());
|
||||
cx.update(|window, cx| window.focus_next(cx));
|
||||
press("enter", cx);
|
||||
press("up", cx);
|
||||
view.update(cx, |desk, cx| {
|
||||
@@ -248,7 +248,7 @@ fn rows_the_owner_removes_leave_the_menu_usable(cx: &mut TestAppContext) {
|
||||
#[gpui::test]
|
||||
fn closing_from_the_trigger_hands_focus_back(cx: &mut TestAppContext) {
|
||||
let (view, cx) = desk(cx);
|
||||
cx.update(|window, _| window.focus_next());
|
||||
cx.update(|window, cx| window.focus_next(cx));
|
||||
press("enter", cx);
|
||||
click(12.0, 12.0, cx);
|
||||
press("enter", cx);
|
||||
@@ -269,7 +269,7 @@ fn confirm_keys_stay_inside_the_menu(cx: &mut TestAppContext) {
|
||||
#[gpui::test]
|
||||
fn modified_confirm_keys_do_not_pick(cx: &mut TestAppContext) {
|
||||
let (view, cx) = desk(cx);
|
||||
cx.update(|window, _| window.focus_next());
|
||||
cx.update(|window, cx| window.focus_next(cx));
|
||||
press("enter", cx);
|
||||
press("ctrl-enter", cx);
|
||||
press("shift-space", cx);
|
||||
@@ -281,7 +281,7 @@ fn modified_confirm_keys_do_not_pick(cx: &mut TestAppContext) {
|
||||
#[gpui::test]
|
||||
fn a_second_right_click_moves_the_context_menu(cx: &mut TestAppContext) {
|
||||
let (view, cx) = desk(cx);
|
||||
cx.update(|window, _| window.focus_next());
|
||||
cx.update(|window, cx| window.focus_next(cx));
|
||||
for at in [point(px(150.0), px(120.0)), point(px(20.0), px(40.0))] {
|
||||
cx.simulate_mouse_move(at, None, Modifiers::none());
|
||||
cx.simulate_mouse_down(at, MouseButton::Right, Modifiers::none());
|
||||
@@ -312,9 +312,9 @@ fn a_left_press_in_the_region_closes_the_context_menu(cx: &mut TestAppContext) {
|
||||
}
|
||||
|
||||
fn open_find(cx: &mut VisualTestContext) {
|
||||
cx.update(|window, _| {
|
||||
window.focus_next();
|
||||
window.focus_next();
|
||||
cx.update(|window, cx| {
|
||||
window.focus_next(cx);
|
||||
window.focus_next(cx);
|
||||
});
|
||||
press("enter", cx);
|
||||
}
|
||||
|
||||
@@ -24,6 +24,8 @@ fn action(name: &str, action: impl gpui::Action) -> OwnedMenuItem {
|
||||
name: name.into(),
|
||||
action: Box::new(action),
|
||||
os_action: None,
|
||||
checked: false,
|
||||
disabled: false,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -33,6 +35,7 @@ impl Render for Bar {
|
||||
OwnedMenu {
|
||||
name: "File".into(),
|
||||
items: vec![action("Open", OpenFile), action("Save", Save)],
|
||||
disabled: false,
|
||||
},
|
||||
OwnedMenu {
|
||||
name: "Edit".into(),
|
||||
@@ -42,8 +45,10 @@ impl Render for Bar {
|
||||
OwnedMenuItem::Submenu(OwnedMenu {
|
||||
name: "More".into(),
|
||||
items: vec![action("Deep", Deep)],
|
||||
disabled: false,
|
||||
}),
|
||||
],
|
||||
disabled: false,
|
||||
},
|
||||
];
|
||||
div()
|
||||
@@ -70,7 +75,7 @@ fn bar(cx: &mut TestAppContext) -> (gpui::Entity<Bar>, &mut VisualTestContext) {
|
||||
ran: Vec::new(),
|
||||
});
|
||||
settle(cx);
|
||||
cx.update(|window, _| window.focus_next());
|
||||
cx.update(|window, cx| window.focus_next(cx));
|
||||
(view, cx)
|
||||
}
|
||||
|
||||
@@ -150,7 +155,7 @@ fn wheel(cx: &mut TestAppContext) -> (gpui::Entity<Wheel>, &mut VisualTestContex
|
||||
enters_above: 0,
|
||||
});
|
||||
settle(cx);
|
||||
cx.update(|window, cx| window.focus(&view.read(cx).before.clone()));
|
||||
cx.update(|window, cx| window.focus(&view.read(cx).before.clone(), cx));
|
||||
let at = point(px(300.0), px(300.0));
|
||||
cx.simulate_mouse_move(at, None, Modifiers::none());
|
||||
cx.simulate_mouse_down(at, MouseButton::Right, Modifiers::none());
|
||||
|
||||
Reference in new issue
Block a user