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
@@ -318,7 +318,7 @@ impl TextInput {
|
||||
if self.disabled {
|
||||
return;
|
||||
}
|
||||
window.focus(&self.focus);
|
||||
window.focus(&self.focus, cx);
|
||||
let at = self.offset_for_point(event.position);
|
||||
match event.click_count {
|
||||
2 => {
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
use std::rc::Rc;
|
||||
|
||||
use gpui::{
|
||||
App, AvailableSpace, Bounds, ContentMask, DispatchPhase, Element, ElementId,
|
||||
ElementInputHandler, Entity, FontStyle, GlobalElementId, Hsla, InspectorElementId, IntoElement,
|
||||
@@ -27,7 +29,7 @@ impl IntoElement for TextElement {
|
||||
}
|
||||
|
||||
pub(crate) struct Prepaint {
|
||||
lines: Vec<(usize, WrappedLine)>,
|
||||
lines: Rc<[(usize, WrappedLine)]>,
|
||||
selections: Vec<Bounds<Pixels>>,
|
||||
caret: Option<Bounds<Pixels>>,
|
||||
selection_color: Hsla,
|
||||
@@ -219,7 +221,8 @@ impl Element for TextElement {
|
||||
.text_system()
|
||||
.shape_text(text.clone().into(), font_size, &runs, wrap, None)
|
||||
.expect("text input shaping failed");
|
||||
let lines: Vec<(usize, WrappedLine)> = line_starts(&text).into_iter().zip(shaped).collect();
|
||||
let lines: Rc<[(usize, WrappedLine)]> =
|
||||
line_starts(&text).into_iter().zip(shaped).collect();
|
||||
let focused = input.focus().is_focused(window);
|
||||
let caret_on = input.caret_on();
|
||||
self.input.update(cx, |input, _| {
|
||||
@@ -285,7 +288,7 @@ impl Element for TextElement {
|
||||
window.with_content_mask(Some(ContentMask { bounds }), |window| {
|
||||
let mut origins = Vec::with_capacity(prepaint.lines.len());
|
||||
let mut top = Pixels::ZERO;
|
||||
for (_, line) in &prepaint.lines {
|
||||
for (_, line) in prepaint.lines.iter() {
|
||||
origins.push(bounds.origin - scroll + point(Pixels::ZERO, top));
|
||||
top += line.size(line_height).height;
|
||||
}
|
||||
|
||||
@@ -59,7 +59,7 @@ impl TextInput {
|
||||
return Some(Point::default());
|
||||
}
|
||||
let mut top = Pixels::ZERO;
|
||||
for (start, line) in &layout.lines {
|
||||
for (start, line) in layout.lines.iter() {
|
||||
if display <= start + line.len() {
|
||||
let at = line.position_for_index(display - start, layout.line_height)?;
|
||||
return Some(gpui::point(at.x, at.y + top));
|
||||
@@ -82,7 +82,7 @@ impl TextInput {
|
||||
return 0;
|
||||
}
|
||||
let mut top = Pixels::ZERO;
|
||||
for (start, line) in &layout.lines {
|
||||
for (start, line) in layout.lines.iter() {
|
||||
let height = line.size(layout.line_height).height;
|
||||
if local.y < top + height {
|
||||
let inside = gpui::point(local.x.max(Pixels::ZERO), local.y - top);
|
||||
|
||||
@@ -36,7 +36,7 @@ pub(crate) type Fit = Rc<dyn Fn(&str, Range<usize>, &str) -> (String, usize)>;
|
||||
|
||||
/// The last shaped text: one entry per hard line, with its display offset.
|
||||
pub(crate) struct Layout {
|
||||
pub lines: Vec<(usize, WrappedLine)>,
|
||||
pub lines: Rc<[(usize, WrappedLine)]>,
|
||||
pub bounds: Bounds<Pixels>,
|
||||
pub line_height: Pixels,
|
||||
/// The lines show the placeholder, not content.
|
||||
|
||||
Reference in new issue
Block a user