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
@@ -79,7 +79,7 @@ fn an_async_view_shows_its_value_once_loaded(cx: &mut TestAppContext) {
|
||||
fn a_failed_load_tries_again_from_its_button(cx: &mut TestAppContext) {
|
||||
let (loads, shows, cx) = report(true, cx);
|
||||
assert_eq!((loads.load(Ordering::SeqCst), shows.get()), (1, 0));
|
||||
cx.update(|window, _| window.focus_next());
|
||||
cx.update(|window, cx| window.focus_next(cx));
|
||||
press("enter", cx);
|
||||
settle(cx);
|
||||
assert_eq!(loads.load(Ordering::SeqCst), 2);
|
||||
|
||||
@@ -75,7 +75,7 @@ fn desk(cx: &mut TestAppContext) -> (Entity<Desk>, &mut VisualTestContext) {
|
||||
});
|
||||
settle(cx);
|
||||
let root = view.read_with(cx, |desk, _| desk.root.clone());
|
||||
cx.update(|window, _| window.focus(&root));
|
||||
cx.update(|window, cx| window.focus(&root, cx));
|
||||
(view, cx)
|
||||
}
|
||||
|
||||
@@ -161,6 +161,19 @@ fn the_pointer_on_the_stack_holds_the_clock(cx: &mut TestAppContext) {
|
||||
assert!(toasts(&view, cx).is_empty());
|
||||
}
|
||||
|
||||
#[gpui::test]
|
||||
fn typing_under_a_resting_pointer_keeps_the_hold(cx: &mut TestAppContext) {
|
||||
let (view, cx) = desk(cx);
|
||||
let id = push(&view, Toast::new("Saved"), cx);
|
||||
let screen = cx.update(|window, _| window.viewport_size());
|
||||
let on_toast = point(screen.width - px(120.0), screen.height - px(48.0));
|
||||
cx.simulate_mouse_move(on_toast, None, Modifiers::none());
|
||||
settle(cx);
|
||||
press("a", cx);
|
||||
wait(Duration::from_secs(20), cx);
|
||||
assert_eq!(toasts(&view, cx), [(id, false)], "a key leaves the pointer");
|
||||
}
|
||||
|
||||
#[gpui::test]
|
||||
fn a_fifth_toast_sends_the_oldest_away(cx: &mut TestAppContext) {
|
||||
let (view, cx) = desk(cx);
|
||||
|
||||
@@ -73,7 +73,7 @@ fn shelf(
|
||||
});
|
||||
settle(cx);
|
||||
let root = view.read_with(cx, |shelf, _| shelf.root.clone());
|
||||
cx.update(|window, _| window.focus(&root));
|
||||
cx.update(|window, cx| window.focus(&root, cx));
|
||||
(view, cx)
|
||||
}
|
||||
|
||||
@@ -113,7 +113,7 @@ fn retry_shows_only_once_saving_failed(cx: &mut TestAppContext) {
|
||||
});
|
||||
settle(cx);
|
||||
let root = view.read_with(cx, |shelf, _| shelf.root.clone());
|
||||
cx.update(|window, _| window.focus(&root));
|
||||
cx.update(|window, cx| window.focus(&root, cx));
|
||||
for _ in 0..3 {
|
||||
press("tab", cx);
|
||||
}
|
||||
|
||||
@@ -4,10 +4,10 @@ use std::{
|
||||
};
|
||||
|
||||
use gpui::{
|
||||
Animation, AnimationExt, AnyElement, App, ClickEvent, Context, Corner, ElementId, Entity,
|
||||
FontWeight, InteractiveElement, IntoElement, ParentElement, Pixels, RenderOnce, SharedString,
|
||||
StatefulInteractiveElement, Styled, Task, Window, anchored, canvas, div, point, prelude::*,
|
||||
relative,
|
||||
Anchor, Animation, AnimationExt, AnyElement, App, ClickEvent, Context, ElementId, Entity,
|
||||
FontWeight, HoverListenerMode, InteractiveElement, IntoElement, ParentElement, Pixels,
|
||||
RenderOnce, SharedString, StatefulInteractiveElement, Styled, Task, Window, anchored, canvas,
|
||||
div, point, prelude::*, relative,
|
||||
};
|
||||
|
||||
use crate::{
|
||||
@@ -230,6 +230,7 @@ impl RenderOnce for ToastViewport {
|
||||
.flex()
|
||||
.flex_col()
|
||||
.w(width)
|
||||
.hover_listener_mode(HoverListenerMode::InputModalityIndependent)
|
||||
.on_hover(move |hovered, _, cx| {
|
||||
hold.update(cx, |toaster, cx| toaster.hold(*hovered, cx))
|
||||
})
|
||||
@@ -238,7 +239,7 @@ impl RenderOnce for ToastViewport {
|
||||
(self.id, "raised"),
|
||||
anchored()
|
||||
.position(point(viewport.width - margin, viewport.height - margin))
|
||||
.anchor(Corner::BottomRight)
|
||||
.anchor(Anchor::BottomRight)
|
||||
.child(stack),
|
||||
)
|
||||
.with_priority(1)
|
||||
|
||||
Reference in new issue
Block a user