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
+10
-4
@@ -7,9 +7,9 @@ use std::{
|
||||
|
||||
use gpui::{
|
||||
AnyElement, App, DispatchPhase, ElementId, InteractiveElement, IntoElement, KeyContext,
|
||||
Modifiers, MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent, ParentElement, Pixels,
|
||||
Point, RenderOnce, ScrollDelta, ScrollWheelEvent, StatefulInteractiveElement, Styled, Window,
|
||||
canvas, div, prelude::FluentBuilder,
|
||||
Keystroke, Modifiers, MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent, ParentElement,
|
||||
Pixels, Point, RenderOnce, ScrollDelta, ScrollWheelEvent, StatefulInteractiveElement, Styled,
|
||||
Window, canvas, div, prelude::FluentBuilder,
|
||||
};
|
||||
use smallvec::SmallVec;
|
||||
|
||||
@@ -43,6 +43,12 @@ fn button(button: MouseButton) -> String {
|
||||
format!("{button:?}").to_lowercase()
|
||||
}
|
||||
|
||||
/// The key gpui makes of a modifier pressed and released alone; the log shows it as modifiers.
|
||||
fn lone_modifier(keystroke: &Keystroke) -> bool {
|
||||
let names = ["shift", "control", "alt", "platform", "function"];
|
||||
!keystroke.modifiers.modified() && names.contains(&keystroke.key.as_str())
|
||||
}
|
||||
|
||||
impl fmt::Display for Seen {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
match self {
|
||||
@@ -158,7 +164,7 @@ impl RenderOnce for EventLogger {
|
||||
.context_stack
|
||||
.iter()
|
||||
.any(|context| context.get("logger").is_some_and(|logger| *logger == mark));
|
||||
if inside {
|
||||
if inside && !lone_modifier(&event.keystroke) {
|
||||
down(Seen::KeyDown(event.keystroke.unparse()), cx)
|
||||
}
|
||||
})
|
||||
|
||||
Reference in new issue
Block a user