Replace the cosmic-text path with Parley layout and Swash rasterization, backed by shared glyph-atlas pages. Shaping, editing, rasterization, and glyph rendering move together because they share the text buffer and rendered-glyph types; splitting them further would require a temporary renderer that is immediately removed. This is reconstructed rather than replayed from the extraction history. It also fixes issues found during review: - texture binding changes remain set when an atlas patch follows a new page - pressing an empty field places a caret and accepts input - selection motion delegates collapse behavior to Parley - character deletion follows logical clusters rather than visual neighbors - the unused root-level Swash dependency is omitted Four public-behavior integration tests live in `tests/text_edit.rs`: empty-field input, multibyte IME preedit replacement, UTF-8-safe backspace, and selection replacement. The old twelve-test inline block and implementation-restating cases are omitted. Every added source comment was manually reviewed. Comments that narrated implementation or history were removed; retained comments document cache/rasterization keys, GPU upload constraints, focus representation, bidi geometry, or IME semantics. Known limitation: atlas pages currently grow without eviction. Each page is 4 MiB on CPU and GPU. An arbitrary cap would leave cached rendered-text UVs pointing at reused glyph slots, so bounding this safely needs a later generation/invalidation change. This changes public text types and signatures. GPU glyph rendering is covered by compilation rather than a live-surface test. Verified with: - `cargo fmt --all --check` - `cargo clippy --workspace --all-targets -- -D warnings` - `cargo test --workspace` (four integration tests pass) Cargo still reports inherited future-incompatibility notices for existing wgpu/winit dependencies; there are no current clippy warnings. --------- Co-authored-by: iris <2+iris@noreply.localhost> Reviewed-on: iris/iris#10 Reviewed-by: iris <2+iris@noreply.localhost> Co-authored-by: AIris <4+iris-ai@noreply.localhost>
133 lines
3.5 KiB
Rust
133 lines
3.5 KiB
Rust
use crate::prelude::*;
|
|
use std::marker::{PhantomData, Sized};
|
|
|
|
pub struct TextBuilder<State, O = TextOutput, H: WidgetOption<State> = ()> {
|
|
pub content: String,
|
|
pub attrs: TextAttrs,
|
|
pub hint: H,
|
|
pub output: O,
|
|
state: PhantomData<State>,
|
|
}
|
|
|
|
impl<State, O, H: WidgetOption<State>> TextBuilder<State, O, H> {
|
|
pub fn size(mut self, size: impl UiNum) -> Self {
|
|
self.attrs.font_size = size.to_f32();
|
|
self.attrs.line_height = self.attrs.font_size * LINE_HEIGHT_MULT;
|
|
self
|
|
}
|
|
pub fn color(mut self, color: UiColor) -> Self {
|
|
self.attrs.color = color;
|
|
self
|
|
}
|
|
pub fn family(mut self, family: Family) -> Self {
|
|
self.attrs.family = family;
|
|
self
|
|
}
|
|
pub fn line_height(mut self, height: f32) -> Self {
|
|
self.attrs.line_height = height;
|
|
self
|
|
}
|
|
pub fn text_align(mut self, align: impl Into<RegionAlign>) -> Self {
|
|
self.attrs.align = align.into();
|
|
self
|
|
}
|
|
pub fn center_text(mut self) -> Self {
|
|
self.attrs.align = Align::CENTER;
|
|
self
|
|
}
|
|
pub fn wrap(mut self, wrap: bool) -> Self {
|
|
self.attrs.wrap = wrap;
|
|
self
|
|
}
|
|
pub fn editable(self, mode: EditMode) -> TextBuilder<State, TextEditOutput, H> {
|
|
TextBuilder {
|
|
content: self.content,
|
|
attrs: self.attrs,
|
|
hint: self.hint,
|
|
output: TextEditOutput { mode },
|
|
state: PhantomData,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<Rsc: UiRsc, O> TextBuilder<Rsc, O> {
|
|
pub fn hint<W: WidgetLike<Rsc, Tag>, Tag>(
|
|
self,
|
|
hint: W,
|
|
) -> TextBuilder<Rsc, O, impl WidgetOption<Rsc>> {
|
|
TextBuilder {
|
|
content: self.content,
|
|
attrs: self.attrs,
|
|
hint: move |rsc: &mut Rsc| Some(hint.add_strong(rsc).any()),
|
|
output: self.output,
|
|
state: PhantomData,
|
|
}
|
|
}
|
|
}
|
|
|
|
pub trait TextBuilderOutput<State>: Sized {
|
|
type Output;
|
|
fn run<H: WidgetOption<State>>(
|
|
state: &mut State,
|
|
builder: TextBuilder<State, Self, H>,
|
|
) -> Self::Output;
|
|
}
|
|
|
|
pub struct TextOutput;
|
|
impl<Rsc: UiRsc> TextBuilderOutput<Rsc> for TextOutput {
|
|
type Output = Text;
|
|
|
|
fn run<H: WidgetOption<Rsc>>(
|
|
state: &mut Rsc,
|
|
builder: TextBuilder<Rsc, Self, H>,
|
|
) -> Self::Output {
|
|
let buf = TextBuffer::new(&builder.content);
|
|
let hint = builder.hint.get(state);
|
|
let mut text = Text {
|
|
content: builder.content.into(),
|
|
view: TextView::new(buf, builder.attrs, hint),
|
|
};
|
|
text.content.changed = false;
|
|
text
|
|
}
|
|
}
|
|
|
|
pub struct TextEditOutput {
|
|
mode: EditMode,
|
|
}
|
|
|
|
impl<State: UiRsc> TextBuilderOutput<State> for TextEditOutput {
|
|
type Output = TextEdit;
|
|
|
|
fn run<H: WidgetOption<State>>(
|
|
state: &mut State,
|
|
builder: TextBuilder<State, Self, H>,
|
|
) -> Self::Output {
|
|
let buf = TextBuffer::new(&builder.content);
|
|
TextEdit::new(
|
|
TextView::new(buf, builder.attrs, builder.hint.get(state)),
|
|
builder.output.mode,
|
|
)
|
|
}
|
|
}
|
|
|
|
impl<State, O: TextBuilderOutput<State>, H: WidgetOption<State>> FnOnce<(&mut State,)>
|
|
for TextBuilder<State, O, H>
|
|
{
|
|
type Output = O::Output;
|
|
|
|
extern "rust-call" fn call_once(self, args: (&mut State,)) -> Self::Output {
|
|
O::run(args.0, self)
|
|
}
|
|
}
|
|
|
|
pub fn wtext<State>(content: impl Into<String>) -> TextBuilder<State> {
|
|
TextBuilder {
|
|
content: content.into(),
|
|
attrs: TextAttrs::default(),
|
|
hint: (),
|
|
output: TextOutput,
|
|
state: PhantomData,
|
|
}
|
|
}
|