ZacharyZhang-NY
4c3ed1bbb9
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.
69 lines
2.4 KiB
Rust
69 lines
2.4 KiB
Rust
use std::rc::Rc;
|
|
|
|
use gpui::{
|
|
AnyElement, App, Entity, FocusHandle, InteractiveElement, IntoElement, MouseButton,
|
|
ParentElement, Pixels, SharedString, Styled, Window, div,
|
|
};
|
|
|
|
use super::{gesture::OnPair, view::Frame};
|
|
use crate::forms::{Editing, Input};
|
|
|
|
/// Opens a field on the words of what `key` names. Enter or leaving hands them to the owner; Escape drops them. Enter and Escape hand focus back to `back`.
|
|
pub(super) fn begin(
|
|
editing: &Entity<Editing>,
|
|
key: SharedString,
|
|
words: String,
|
|
on_text: Option<OnPair>,
|
|
back: FocusHandle,
|
|
window: &mut Window,
|
|
cx: &mut App,
|
|
) {
|
|
log::info!("canvas: writing on {key}");
|
|
editing.update(cx, |editing, _| {
|
|
editing.on_commit = Some(Rc::new(
|
|
move |text: &SharedString, window: &mut Window, cx: &mut App| {
|
|
log::info!("canvas: {key} reads {text:?}");
|
|
if let Some(on_text) = &on_text {
|
|
on_text(&key, text, window, cx);
|
|
}
|
|
},
|
|
));
|
|
});
|
|
Editing::begin(editing, words, window, cx);
|
|
editing.update(cx, |editing, _| editing.returning(back));
|
|
}
|
|
|
|
/// The open field over `frame`, in view pixels.
|
|
pub(super) fn field(editing: &Entity<Editing>, frame: Frame, cx: &App) -> Option<AnyElement> {
|
|
let field = editing.read(cx).field()?;
|
|
let (closing, keeping) = (editing.clone(), editing.clone());
|
|
Some(
|
|
div()
|
|
.absolute()
|
|
.left(Pixels::from(frame.x))
|
|
.top(Pixels::from(frame.y))
|
|
.w(Pixels::from(frame.w))
|
|
.on_mouse_down(MouseButton::Left, |_, _, cx| cx.stop_propagation())
|
|
.on_key_down(move |event, window, cx| {
|
|
if event.keystroke.key == "escape" {
|
|
cx.stop_propagation();
|
|
closing.update(cx, |editing, cx| {
|
|
editing.finish(true, window, cx);
|
|
editing.give_back(window, cx);
|
|
});
|
|
}
|
|
})
|
|
.on_key_up(move |event, window, cx| {
|
|
if event.keystroke.key == "enter" {
|
|
cx.stop_propagation();
|
|
keeping.update(cx, |editing, cx| {
|
|
editing.finish(false, window, cx);
|
|
editing.give_back(window, cx);
|
|
});
|
|
}
|
|
})
|
|
.child(Input::new(&field))
|
|
.into_any_element(),
|
|
)
|
|
}
|