Merge pull request #308 from feefs/main

Implement palette.spacing feature

contrib/themes/Beryllium.toml

@@ -10,7 +10,8 @@ border          = "plain"
 visible         = true
 
 [palette]
-glyph           = "○  "
+glyph           = "○"
+spacing         = 2
 visible         = true
 
 [bar]

contrib/themes/Lithium.toml

@@ -9,7 +9,8 @@ separator_color = "Yellow"
 
 [palette]
 type            = "Light"
-glyph           = " ● "
+glyph           = "●"
+spacing         = 2
 visible         = true
 
 [bar]

src/theme/components.rs

@@ -1,15 +1,16 @@
 use crate::theme::borders::Border;
 use crate::theme::color::*;
 use rand::Rng;
-use serde::{Deserialize, Serialize};
-use std::path::PathBuf;
 use ratatui::style::Color;
 use ratatui::widgets::BorderType;
+use serde::{Deserialize, Serialize};
+use std::path::PathBuf;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Palette {
     r#type: Option<PaletteType>,
     glyph: Option<String>,
+    spacing: Option<usize>,
     visible: Option<bool>,
 }
 
@@ -18,6 +19,7 @@ impl Default for Palette {
         Palette {
             r#type: Some(PaletteType::Dark),
             glyph: Some(String::from("   ")),
+            spacing: Some(0),
             visible: None,
         }
     }
@@ -36,6 +38,14 @@ impl Palette {
         self.glyph.as_ref()
     }
 
+    pub fn get_spacing(&self) -> usize {
+        if let Some(v) = self.spacing {
+            return v;
+        }
+
+        0
+    }
+
     pub fn is_visible(&self) -> bool {
         if let Some(v) = self.visible {
             return v;

src/widgets/readout.rs

@@ -104,7 +104,7 @@ impl<'a> Widget for ReadoutList<'a> {
                 self.create_item_constraints(max_key_width, &themed_separator, readout_data);
             let layout = Self::create_layout(&list_item_area, &constraints);
 
-            let total_line_width = constraints.iter().sum::<u16>() + constraints.len() as u16 - 1;
+            let total_line_width = constraints.iter().sum::<u16>();
             if total_line_width > max_line_width {
                 max_line_width = total_line_width;
             }
@@ -125,7 +125,13 @@ impl<'a> Widget for ReadoutList<'a> {
             height += readout_data.height() as u16;
         }
 
-        self.print_palette(buf, &list_area, &mut height, self.theme.get_palette());
+        self.print_palette(
+            buf,
+            &list_area,
+            &mut height,
+            &mut max_line_width,
+            self.theme.get_palette(),
+        );
 
         Self::render_block(
             self.block,
@@ -145,6 +151,7 @@ impl<'a> ReadoutList<'a> {
         buf: &mut Buffer,
         list_area: &Rect,
         height: &mut u16,
+        max_line_width: &mut u16,
         palette: &Palette,
     ) {
         if !palette.is_visible() {
@@ -174,17 +181,24 @@ impl<'a> ReadoutList<'a> {
         ];
 
         let span_vector = |colors: &[Color]| -> Vec<_> {
+            let mut spans: Vec<Span<'_>> = Vec::with_capacity(colors.len() * 2);
+            let spacing_span = Span::raw(" ".repeat(palette.get_spacing()));
             if let Some(glyph) = palette.get_glyph() {
-                colors
-                    .iter()
-                    .map(|c| Span::styled(glyph.to_owned(), Style::default().fg(c.to_owned())))
-                    .collect()
+                for c in colors {
+                    spans.push(Span::styled(
+                        glyph.to_owned(),
+                        Style::default().fg(c.to_owned()),
+                    ));
+                    spans.push(spacing_span.clone());
+                }
             } else {
-                colors
-                    .iter()
-                    .map(|c| Span::styled("   ", Style::default().bg(c.to_owned())))
-                    .collect()
+                for c in colors {
+                    spans.push(Span::styled("   ", Style::default().bg(c.to_owned())));
+                    spans.push(spacing_span.clone());
+                }
             }
+            spans.pop();
+            spans
         };
 
         let spans = match palette.get_type() {
@@ -196,6 +210,18 @@ impl<'a> ReadoutList<'a> {
             ],
         };
 
+        let mut width_values = vec![];
+        if self.theme.get_padding() > 0 {
+            width_values.push(self.theme.get_padding())
+        }
+        if let Some(span_max_width) = spans.iter().map(|s| s.width()).max() {
+            width_values.push(span_max_width);
+        }
+        let palette_max_line_width: usize = width_values.iter().sum();
+        if palette_max_line_width as u16 > *max_line_width {
+            *max_line_width = palette_max_line_width as u16;
+        }
+
         let padding = self.theme.get_padding() as u16;
 
         let area = Rect::new(