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

src/layout/text.rs

@@ -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(