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
+12
-5
@@ -3,8 +3,8 @@ use std::{ops::Range, rc::Rc};
|
||||
use alacritty_terminal::vte::ansi::CursorShape;
|
||||
use gpui::{
|
||||
BorderStyle, Bounds, ElementInputHandler, Entity, Font, FontStyle, FontWeight, Hsla,
|
||||
IntoElement, Pixels, Size, StrikethroughStyle, Styled, TextRun, UnderlineStyle, canvas, fill,
|
||||
outline, point, size,
|
||||
IntoElement, Pixels, Size, StrikethroughStyle, Styled, TextAlign, TextRun, UnderlineStyle,
|
||||
canvas, fill, outline, point, size,
|
||||
};
|
||||
|
||||
use super::{
|
||||
@@ -101,7 +101,7 @@ pub(crate) fn grid(
|
||||
Some(cell.width),
|
||||
);
|
||||
shaped
|
||||
.paint_background(at(ix, 0), cell.height, window, cx)
|
||||
.paint_background(at(ix, 0), cell.height, TextAlign::Left, None, window, cx)
|
||||
.expect("a terminal row's ground paints");
|
||||
for (_, columns, why) in frame.lit.iter().filter(|(row, ..)| *row == ix) {
|
||||
let wash = match why {
|
||||
@@ -113,7 +113,7 @@ pub(crate) fn grid(
|
||||
window.paint_quad(fill(Bounds::new(at(ix, columns.start), extent), wash));
|
||||
}
|
||||
shaped
|
||||
.paint(at(ix, 0), cell.height, window, cx)
|
||||
.paint(at(ix, 0), cell.height, TextAlign::Left, None, window, cx)
|
||||
.expect("a terminal row paints");
|
||||
for (column, cluster, style) in &row.clusters {
|
||||
let run = TextRun {
|
||||
@@ -127,7 +127,14 @@ pub(crate) fn grid(
|
||||
window
|
||||
.text_system()
|
||||
.shape_line(cluster.clone().into(), look.size, &[run], None)
|
||||
.paint(at(ix, *column), cell.height, window, cx)
|
||||
.paint(
|
||||
at(ix, *column),
|
||||
cell.height,
|
||||
TextAlign::Left,
|
||||
None,
|
||||
window,
|
||||
cx,
|
||||
)
|
||||
.expect("a terminal cluster paints");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user