shadowcat/iris
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

actually use the text library for text editing (fully working I think but code isn't cleanest)

Browse Source
This commit is contained in:
shadow cat
2025-09-15 14:34:57 -04:00
parent e9853120ce
commit 9d659b6afd
8 changed files with 278 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/layout/painter.rs
View File

@@ -2,8 +2,8 @@ use std::ops::Range;
use crate::{
layout::{
Active, Cursor, TextAttrs, TextBuffer, TextData, TextOffset, TextureHandle, Textures,
UiRegion, Vec2, WidgetId, Widgets,
Active, TextAttrs, TextBuffer, TextData, TextOffset, TextureHandle, Textures, UiRegion,
Vec2, VisualCursor, WidgetId, Widgets,
},
render::{Primitive, PrimitiveHandle, Primitives},
util::{HashSet, Id},
@@ -277,13 +277,10 @@ impl<'a, 'c> Painter<'a, 'c> {
pub fn render_text(
&mut self,
buffer: &mut TextBuffer,
content: &str,
attrs: &TextAttrs,
cursor: &Cursor,
cursor: &VisualCursor,
) -> (TextureHandle, TextOffset) {
self.ctx
.text
.draw(buffer, content, attrs, cursor, self.ctx.textures)
self.ctx.text.draw(buffer, attrs, cursor, self.ctx.textures)
}
pub fn region(&self) -> UiRegion {
@@ -307,6 +304,10 @@ impl<'a, 'c> Painter<'a, 'c> {
checked: &mut self.sized_children,
}
}
pub fn text_data(&mut self) -> &mut TextData {
self.ctx.text
}
}
pub struct SizeCtx<'a> {
@@ -325,12 +326,10 @@ impl SizeCtx<'_> {
pub fn draw_text(
&mut self,
buffer: &mut TextBuffer,
content: &str,
attrs: &TextAttrs,
cursor: &Cursor,
cursor: &VisualCursor,
) -> (TextureHandle, TextOffset) {
self.text
.draw(buffer, content, attrs, cursor, self.textures)
self.text.draw(buffer, attrs, cursor, self.textures)
}
}

45
src/layout/text.rs
View File

@@ -1,4 +1,4 @@
use cosmic_text::{Attrs, Buffer, Family, FontSystem, Metrics, Shaping, SwashCache};
use cosmic_text::{Attrs, AttrsList, Buffer, Family, FontSystem, Metrics, SwashCache};
use image::{Rgba, RgbaImage};
use crate::{
@@ -7,8 +7,8 @@ use crate::{
};
pub struct TextData {
font_system: FontSystem,
swash_cache: SwashCache,
pub font_system: FontSystem,
pub swash_cache: SwashCache,
}
impl Default for TextData {
@@ -28,8 +28,19 @@ pub struct TextAttrs {
pub family: Family<'static>,
}
impl TextAttrs {
pub fn apply(&self, font_system: &mut FontSystem, buf: &mut Buffer) {
buf.set_metrics(font_system, Metrics::new(self.font_size, self.line_height));
let attrs = Attrs::new().family(self.family);
let list = AttrsList::new(&attrs);
for line in &mut buf.lines {
line.set_attrs_list(list.clone());
}
}
}
#[derive(Default, Debug, Copy, Clone)]
pub enum Cursor {
pub enum VisualCursor {
#[default]
None,
Select {
@@ -56,21 +67,10 @@ impl TextData {
pub fn draw(
&mut self,
buffer: &mut TextBuffer,
content: &str,
attrs: &TextAttrs,
cursor: &Cursor,
cursor: &VisualCursor,
textures: &mut Textures,
) -> (TextureHandle, TextOffset) {
buffer.set_metrics(
&mut self.font_system,
Metrics::new(attrs.font_size, attrs.line_height),
);
buffer.set_text(
&mut self.font_system,
content,
&Attrs::new().family(attrs.family),
Shaping::Advanced,
);
let mut pixels = HashMap::new();
let mut min_x = 0;
let mut min_y = 0;
@@ -80,7 +80,7 @@ impl TextData {
let mut max_width = 0.0f32;
let mut cursor_x = 0;
for (run_i, run) in buffer.layout_runs().enumerate() {
if let Cursor::Select { line, .. } = cursor
if let VisualCursor::Select { line, .. } = cursor
&& *line == run_i as isize
{
cursor_x = run.line_w as i32;
@@ -93,7 +93,7 @@ impl TextData {
None => cosmic_text::Color::rgba(c.r, c.g, c.b, c.a),
};
if let Cursor::Select { col: idx, line } = cursor
if let VisualCursor::Select { col: idx, line } = cursor
&& *line == run_i as isize
&& *idx == i as isize
{
@@ -117,7 +117,7 @@ impl TextData {
}
max_width = max_width.max(run.line_w);
}
if let &Cursor::Select { line, .. } = cursor {
if let &VisualCursor::Select { line, .. } = cursor {
let y = (attrs.line_height * (line + 1) as f32) as i32 - 1;
max_y = max_y.max(y);
max_x = max_x.max(cursor_x);
@@ -130,7 +130,7 @@ impl TextData {
let y = (y - min_y) as u32;
image.put_pixel(x, y, color);
}
if let &Cursor::Select { line, .. } = cursor {
if let &VisualCursor::Select { line, .. } = cursor {
let x = (cursor_x - min_x) as u32;
for y in 0..attrs.line_height as u32 {
// no clue if this is good or bad for non integer values
@@ -139,10 +139,7 @@ impl TextData {
image.put_pixel(x, y, Rgba(c.as_arr()));
}
}
let mut lines = buffer.lines.len();
if content.ends_with('\n') {
lines += 1;
}
let lines = buffer.lines.len();
let offset = TextOffset {
top_left: Vec2::new(min_x as f32, min_y as f32),
bot_right: Vec2::new(

11
src/layout/ui.rs
View File

@@ -1,6 +1,7 @@
use image::DynamicImage;
use crate::{
core::{TextEdit, TextEditCtx},
layout::{
ActiveSensors, PainterCtx, Sensor, SensorMap, StaticWidgetId, TextData, TextureHandle,
Textures, Vec2, Widget, WidgetId, WidgetInstance, WidgetLike,
@@ -24,7 +25,7 @@ pub struct Ui<Ctx> {
// TODO: make these non pub(crate)
pub(crate) primitives: Primitives,
pub(crate) textures: Textures,
text: TextData,
pub(crate) text: TextData,
full_redraw: bool,
pub(super) active: Active,
@@ -188,6 +189,14 @@ impl<Ctx> Ui<Ctx> {
.push(f);
self.widgets.data_mut(&id.id).unwrap().sensor = true;
}
pub fn text(&mut self, id: &WidgetId<TextEdit>) -> TextEditCtx<'_> {
self.updates.push(id.id.duplicate());
TextEditCtx {
text: self.widgets.get_mut(id).unwrap(),
font_system: &mut self.text.font_system,
}
}
}
impl<W: Widget, Ctx> Index<&WidgetId<W>> for Ui<Ctx> {