refactor: Split core render functions (#937)

* refactor: Split core render functions * lint
marc2332 · Oct 6, 2024 · 1317488 · 1317488
1 parent 0cb934f
commit 1317488
Show file tree

Hide file tree

Showing 11 changed files with 638 additions and 566 deletions.
diff --git a/crates/core/src/elements/label.rs b/crates/core/src/elements/label.rs
@@ -11,9 +11,9 @@ use torin::prelude::{
 };
 
 use super::utils::ElementUtils;
-use crate::prelude::{
-    align_main_align_paragraph,
-    DioxusNode,
+use crate::{
+    prelude::DioxusNode,
+    render::align_main_align_paragraph,
 };
 
 pub struct LabelElement;

diff --git a/crates/core/src/elements/paragraph.rs b/crates/core/src/elements/paragraph.rs
@@ -31,12 +31,13 @@ use torin::{
 use super::utils::ElementUtils;
 use crate::{
     dom::DioxusNode,
-    prelude::{
-        align_highlights_and_cursor_paragraph,
+    prelude::TextGroupMeasurement,
+    render::{
         align_main_align_paragraph,
-        TextGroupMeasurement,
+        create_paragraph,
+        draw_cursor,
+        draw_cursor_highlights,
     },
-    render::create_paragraph,
 };
 
 pub struct ParagraphElement;
@@ -230,80 +231,3 @@ impl ElementUtils for ParagraphElement {
         area
     }
 }
-
-fn draw_cursor_highlights(
-    area: &Area,
-    paragraph: &Paragraph,
-    canvas: &Canvas,
-    node_ref: &DioxusNode,
-) -> Option<()> {
-    let node_cursor_state = &*node_ref.get::<CursorState>().unwrap();
-
-    let highlights = node_cursor_state.highlights.as_ref()?;
-    let highlight_color = node_cursor_state.highlight_color;
-
-    for (from, to) in highlights.iter() {
-        let (from, to) = {
-            if from < to {
-                (from, to)
-            } else {
-                (to, from)
-            }
-        };
-        let cursor_rects = paragraph.get_rects_for_range(
-            *from..*to,
-            RectHeightStyle::Tight,
-            RectWidthStyle::Tight,
-        );
-        for cursor_rect in cursor_rects {
-            let rect = align_highlights_and_cursor_paragraph(
-                node_ref,
-                area,
-                paragraph,
-                &cursor_rect,
-                None,
-            );
-
-            let mut paint = Paint::default();
-            paint.set_anti_alias(true);
-            paint.set_style(PaintStyle::Fill);
-            paint.set_color(highlight_color);
-
-            canvas.draw_rect(rect, &paint);
-        }
-    }
-
-    Some(())
-}
-
-fn draw_cursor(
-    area: &Area,
-    paragraph: &Paragraph,
-    canvas: &Canvas,
-    node_ref: &DioxusNode,
-) -> Option<()> {
-    let node_cursor_state = &*node_ref.get::<CursorState>().unwrap();
-
-    let cursor = node_cursor_state.position?;
-    let cursor_color = node_cursor_state.color;
-    let cursor_position = cursor as usize;
-
-    let cursor_rects = paragraph.get_rects_for_range(
-        cursor_position..cursor_position + 1,
-        RectHeightStyle::Tight,
-        RectWidthStyle::Tight,
-    );
-    let cursor_rect = cursor_rects.first()?;
-
-    let rect =
-        align_highlights_and_cursor_paragraph(node_ref, area, paragraph, cursor_rect, Some(1.0));
-
-    let mut paint = Paint::default();
-    paint.set_anti_alias(true);
-    paint.set_style(PaintStyle::Fill);
-    paint.set_color(cursor_color);
-
-    canvas.draw_rect(rect, &paint);
-
-    Some(())
-}