Vline

pulse-ui/src/layout.rs

@@ -114,7 +114,7 @@ impl Rect {
 }
 
 pub fn layout(rows: Vec<LayoutItem>) -> LayoutItem {
-    LayoutItem::Columns {
+    LayoutItem::Rows {
         unit: Size::Percent(100),
         items: rows,
     }

pulse-ui/src/widget/outline.rs

@@ -23,3 +23,33 @@ impl Widget for Outline {
         scope.draw_text((scope.rect.width - 1, scope.rect.height - 1), "┘");
     }
 }
+
+pub struct TVLine;
+
+impl Widget for TVLine {
+    fn render(&self, scope: &mut crate::render::RenderScope) {
+        scope.draw_text(0, "─".repeat(scope.rect.width as usize));
+
+        scope.draw_text(0, "┌");
+        scope.draw_text((scope.rect.width - 1, 0), "┐");
+    }
+}
+
+pub struct BVLine;
+
+impl Widget for BVLine {
+    fn render(&self, scope: &mut crate::render::RenderScope) {
+        scope.draw_text(0, "─".repeat(scope.rect.width as usize));
+
+        scope.draw_text(0, "└");
+        scope.draw_text((scope.rect.width - 1, 0), "┘");
+    }
+}
+
+pub struct VLine;
+
+impl Widget for VLine {
+    fn render(&self, scope: &mut crate::render::RenderScope) {
+        scope.draw_text(0, "─".repeat(scope.rect.width as usize));
+    }
+}

src/main.rs

@@ -1,7 +1,11 @@
 use std::any::Any;
 
 use pulse_ui::{
-    App, layout::{LayoutItem, layout}, state::{Refresh, State}, unit::Size, widget::{outline::Outline, spaced::{SpacedColumns, SpacedRows}},
+    App,
+    layout::{LayoutItem, layout},
+    state::{Refresh, State},
+    unit::Size,
+    widget::outline::VLine,
 };
 
 pub struct PulseTradeApp {
@@ -24,27 +28,24 @@ impl App for PulseTradeApp {
     }
 
     async fn layout(&self) -> pulse_ui::layout::LayoutItem {
-        layout(vec![LayoutItem::Frame {
+        layout(vec![
-            padding: 1,
+            LayoutItem::Columns {
-            item: Box::new(LayoutItem::Widget(Size::Flex(1))),
+                unit: Size::Fixed(1),
-        }])
+                items: vec![
+                    LayoutItem::Widget(Size::Flex(1)),
+                    LayoutItem::Widget(Size::Flex(1)),
+                    LayoutItem::Widget(Size::Flex(1)),
+                ],
+            },
+            LayoutItem::Spacing(Size::Fixed(1)),
+        ])
     }
 
     async fn render(&mut self, layout: pulse_ui::layout::Allocation) {
-        layout.draw_frame(0, Outline);
+        layout.draw_frame(2, VLine);
-
+        layout.draw(0, "one");
-        layout.draw(
+        layout.draw(1, "two");
-            0,
+        layout.draw(2, "three");
-            SpacedColumns(vec![
-                (LayoutItem::Widget(Size::Flex(1)), Box::new("one")),
-                (LayoutItem::Widget(Size::Flex(1)), Box::new("two")),
-                (LayoutItem::Widget(Size::Flex(1)), Box::new("three")),
-                (
-                    LayoutItem::Widget(Size::Flex(1)),
-                    Box::new(self.count.display().await),
-                ),
-            ]),
-        );
     }
 }