style

ynqa · Oct 8, 2023 · 01addfc · 01addfc
1 parent 6331706
commit 01addfc
Show file tree

Hide file tree

Showing 4 changed files with 95 additions and 71 deletions.
diff --git a/examples/readline/readline.rs b/examples/readline/readline.rs
@@ -17,6 +17,11 @@ fn main() -> Result<()> {
             )
             .build()?,
         TextEditorBuilder::new()
+            .style(
+                ContentStyleBuilder::new()
+                    .foreground_color(Color::DarkYellow)
+                    .build(),
+            )
             .label_style(
                 ContentStyleBuilder::new()
                     .foreground_color(Color::DarkGreen)

diff --git a/src/editor/builder/text_editor.rs b/src/editor/builder/text_editor.rs
@@ -7,17 +7,24 @@ use crate::{
 
 pub struct TextEditorBuilder {
     label: String,
+    style: ContentStyle,
     label_style: ContentStyle,
 }
 
 impl TextEditorBuilder {
     pub fn new() -> Self {
         Self {
             label: String::from("❯❯ "),
+            style: ContentStyle::new(),
             label_style: ContentStyle::new(),
         }
     }
 
+    pub fn style(mut self, style: ContentStyle) -> Self {
+        self.style = style;
+        self
+    }
+
     pub fn label<T: AsRef<str>>(mut self, label: T) -> Self {
         self.label = label.as_ref().to_string();
         self
@@ -31,6 +38,7 @@ impl TextEditorBuilder {
     pub fn build(self) -> Result<Box<TextEditor>> {
         Ok(Box::new(TextEditor {
             textbuffer: TextBuffer::new(),
+            style: self.style,
             label: Graphemes::new_with_style(self.label, self.label_style),
         }))
     }

diff --git a/src/editor/text_editor.rs b/src/editor/text_editor.rs
@@ -1,6 +1,9 @@
 use crate::{
-    crossterm::event::{Event, KeyCode, KeyEvent, KeyEventKind, KeyEventState, KeyModifiers},
-    grapheme::{matrixify, Grapheme, Graphemes},
+    crossterm::{
+        event::{Event, KeyCode, KeyEvent, KeyEventKind, KeyEventState, KeyModifiers},
+        style::ContentStyle,
+    },
+    grapheme::{matrixify, Graphemes},
     pane::Pane,
     text_buffer::TextBuffer,
 };
@@ -10,14 +13,15 @@ use super::Editor;
 pub struct TextEditor {
     pub textbuffer: TextBuffer,
 
+    pub style: ContentStyle,
     pub label: Graphemes,
 }
 
 impl Editor for TextEditor {
     fn gen_pane(&self, width: u16) -> Pane {
         let mut buf = Graphemes::default();
         buf.append(&mut self.label.clone());
-        buf.append(&mut self.textbuffer.buf.clone());
+        buf.append(&mut self.textbuffer.graphemes(self.style));
 
         Pane::new(
             matrixify(width as usize, buf),
@@ -73,7 +77,7 @@ impl Editor for TextEditor {
                 modifiers: KeyModifiers::SHIFT,
                 kind: KeyEventKind::Press,
                 state: KeyEventState::NONE,
-            }) => self.textbuffer.insert(Grapheme::new(*ch)),
+            }) => self.textbuffer.insert(*ch),
 
             _ => [TextBuffer::new(), TextBuffer::new()],
         };