From 9d4b247b2abad6b7dfdf3077a93df0297e2db5bb Mon Sep 17 00:00:00 2001 From: Leo dev Date: Sat, 1 Nov 2025 09:25:05 +0100 Subject: [PATCH 01/14] Working area stop --- examples/iter.rs | 3 +++ src/elements/div.rs | 27 ++++++-------------- src/elements/flex.rs | 60 +++++++++++++------------------------------- src/render_scope.rs | 32 +++++++++++++++-------- src/utils.rs | 10 ++++++-- 5 files changed, 58 insertions(+), 74 deletions(-) diff --git a/examples/iter.rs b/examples/iter.rs index c61589b..f551d63 100644 --- a/examples/iter.rs +++ b/examples/iter.rs @@ -20,6 +20,9 @@ pub fn app() -> Rsx { } rsx! { + @transform! { + height: 3 + }; FlexRow { for item in items { static "{item}" diff --git a/src/elements/div.rs b/src/elements/div.rs index d5c5700..631f6c2 100644 --- a/src/elements/div.rs +++ b/src/elements/div.rs @@ -11,14 +11,12 @@ pub struct DivRenderer<'a>(pub &'a mut RawTransform); pub struct Div { children: Vec>, - size: (u16, u16), } impl Div { pub fn new() -> Self { Div { children: Vec::new(), - size: (0, 0), } } } @@ -26,30 +24,21 @@ impl Div { impl Element for Div { fn render( &mut self, - scope: &mut crate::render_scope::RenderScope, - _: &crate::render_scope::RenderContext, - ) { - let (width, height) = scope.get_size_or(self.size.0, self.size.1); - scope.use_area(width, height); - } - - fn after_render( - &mut self, - scope: &mut crate::render_scope::RenderScope, + parent_scope: &mut crate::render_scope::RenderScope, render_context: &crate::render_scope::RenderContext, ) { - let mut transform = scope.get_transform().clone(); + let mut transform = parent_scope.get_transform().clone(); + let (w, h) = parent_scope.get_size_or_parent(); + + let mut scope = crate::render_scope::RenderScope::new(); + scope.set_parent_size(w, h); + let mut renderer = DivRenderer(&mut transform); - - let (w, h) = scope.get_parent_size(); - scope.set_parent_size(renderer.0.width, renderer.0.height); - for widget in &self.children { scope.render_widget(&mut renderer, render_context.get_context(), widget); } - scope.set_parent_size(w, h); - self.size = (renderer.0.width, renderer.0.height); + parent_scope.use_area(w, h); } fn draw_child(&mut self, element: &Arc) { diff --git a/src/elements/flex.rs b/src/elements/flex.rs index 26ff7d4..6b7c9f4 100644 --- a/src/elements/flex.rs +++ b/src/elements/flex.rs @@ -13,20 +13,17 @@ pub struct ColumnRenderer<'a>(&'a mut RawTransform, u16, &'a mut u16); pub struct FlexRow { pub gap: u16, children: Vec>, - size: (u16, u16), } pub struct FlexCol { pub gap: u16, children: Vec>, - size: (u16, u16), } impl FlexRow { pub fn new() -> Self { Self { children: Vec::new(), - size: (0, 0), gap: 0, } } @@ -36,7 +33,6 @@ impl FlexCol { pub fn new() -> Self { Self { children: Vec::new(), - size: (0, 0), gap: 0, } } @@ -45,32 +41,22 @@ impl FlexCol { impl Element for FlexRow { fn render( &mut self, - scope: &mut crate::render_scope::RenderScope, - _: &crate::render_scope::RenderContext, - ) { - let (width, height) = scope.get_size_or(self.size.0, self.size.1); - scope.use_area(width, height); - } - - fn after_render( - &mut self, - scope: &mut crate::render_scope::RenderScope, + parent_scope: &mut crate::render_scope::RenderScope, render_context: &crate::render_scope::RenderContext, ) { - let mut transform = scope.get_transform().clone(); - let transform_before = transform.clone(); - let (w, h) = scope.get_parent_size(); - scope.set_parent_size(transform.width, transform.height); + let mut transform = parent_scope.get_transform().clone(); + let (w, h) = parent_scope.get_size_or_parent(); + + let mut scope = crate::render_scope::RenderScope::new(); + scope.set_parent_size(w, h); + let mut v = 0; - let mut renderer = RowRenderer(&mut transform, self.gap, &mut v); - for widget in &self.children { scope.render_widget(&mut renderer, render_context.get_context(), widget); } - scope.set_parent_size(w, h); - scope.set_transform_raw(transform_before); - self.size = (transform.width, transform.height); + + parent_scope.use_area(w, h); } fn draw_child(&mut self, element: &Arc) { @@ -100,32 +86,22 @@ impl Element for FlexRow { impl Element for FlexCol { fn render( &mut self, - scope: &mut crate::render_scope::RenderScope, - _: &crate::render_scope::RenderContext, - ) { - let (width, height) = scope.get_size_or(self.size.0, self.size.1); - scope.use_area(width, height); - } - - fn after_render( - &mut self, - scope: &mut crate::render_scope::RenderScope, + parent_scope: &mut crate::render_scope::RenderScope, render_context: &crate::render_scope::RenderContext, ) { - let mut transform = scope.get_transform().clone(); - let transform_before = transform.clone(); - let (w, h) = scope.get_parent_size(); - scope.set_parent_size(transform.width, transform.height); + let mut transform = parent_scope.get_transform().clone(); + let (w, h) = parent_scope.get_size_or_parent(); + + let mut scope = crate::render_scope::RenderScope::new(); + scope.set_parent_size(w, h); + let mut v = 0; - let mut renderer = ColumnRenderer(&mut transform, self.gap, &mut v); - for widget in &self.children { scope.render_widget(&mut renderer, render_context.get_context(), widget); } - scope.set_parent_size(w, h); - scope.set_transform_raw(transform_before); - self.size = (transform.width, transform.height); + + parent_scope.use_area(w, h); } fn draw_child(&mut self, element: &Arc) { diff --git a/src/render_scope.rs b/src/render_scope.rs index 6e10914..9207f60 100644 --- a/src/render_scope.rs +++ b/src/render_scope.rs @@ -164,6 +164,7 @@ impl RenderScope { format!("\n│{}│", " ".repeat(width as usize - 2)) .repeat(height as usize - 2), ), + (self.parent_width, self.parent_height), ); } } @@ -181,6 +182,7 @@ impl RenderScope { format!("\n│{}│", " ".repeat(width as usize - 2)) .repeat(height as usize - 2), ), + (self.parent_width, self.parent_height), ); } } @@ -192,24 +194,30 @@ impl RenderScope { .take(height as usize) .collect::>() .join("\n"), + (self.parent_width, self.parent_height), ), } for m in &self.render_stack { match m { RenderMethod::Text(x, y, t) => { + if *y + self.transform.y >= self.parent_height { + continue; + } if let Some(c) = self.style.foreground { utils::print_liner( self.transform.x + self.transform.px + x, self.transform.y + self.transform.py + y, &utils::hex_ansi(c), t, + (self.parent_width, self.parent_height), ); } else { utils::print( self.transform.x + self.transform.px, self.transform.y + self.transform.py, t, + (self.parent_width, self.parent_height), ); } } @@ -220,12 +228,14 @@ impl RenderScope { self.transform.y + self.transform.py + y, &utils::hex_ansi_bg(c), t, + (self.parent_width, self.parent_height), ); } else { utils::print( self.transform.x + self.transform.px, self.transform.y + self.transform.py, t, + (self.parent_width, self.parent_height), ); } } @@ -234,18 +244,18 @@ impl RenderScope { self.transform.y + self.transform.py + y, &utils::hex_ansi(*c), t, + (self.parent_width, self.parent_height), + ), + RenderMethod::Rectangle(x, y, width, height, color) => utils::print_liner( + self.transform.x + self.transform.px + x, + self.transform.y + self.transform.py + y, + &hex_ansi_bg(*color), + &std::iter::repeat(" ".repeat(*width as usize)) + .take(*height as usize) + .collect::>() + .join("\n"), + (self.parent_width, self.parent_height), ), - RenderMethod::Rectangle(x, y, width, height, color) => { - utils::print_liner( - self.transform.x + self.transform.px + x, - self.transform.y + self.transform.py + y, - &hex_ansi_bg(*color), - &std::iter::repeat(" ".repeat(*width as usize)) - .take(*height as usize) - .collect::>() - .join("\n"), - ); - } } } } diff --git a/src/utils.rs b/src/utils.rs index 031149f..4a20819 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -107,15 +107,21 @@ pub fn hex_ansi_bg(hex: u32) -> String { format!("\x1b[48;2;{r};{g};{b}m") } -pub(crate) fn print(x: u16, y: u16, text: &str) { +pub(crate) fn print(x: u16, y: u16, text: &str, area: (u16, u16)) { for (i, line) in text.lines().enumerate() { + if y + i as u16 >= area.1 { + break; + } print!("\x1b[{};{}H{line}\x1b[0m", y + i as u16 + 1, x + 1); flush().unwrap(); } } -pub(crate) fn print_liner(x: u16, y: u16, liner: &str, text: &str) { +pub(crate) fn print_liner(x: u16, y: u16, liner: &str, text: &str, area: (u16, u16)) { for (i, line) in text.lines().enumerate() { + if y + i as u16 >= area.1 { + break; + } print!("\x1b[{};{}H{liner}{line}\x1b[0m", y + i as u16 + 1, x + 1); flush().unwrap(); } From 29432a939b7565dddd0a0f1ed920f73be9d19ee4 Mon Sep 17 00:00:00 2001 From: Leo dev Date: Sat, 1 Nov 2025 09:48:04 +0100 Subject: [PATCH 02/14] Paginator --- src/elements/paginator.rs | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/src/elements/paginator.rs b/src/elements/paginator.rs index c07d46c..2ee034f 100644 --- a/src/elements/paginator.rs +++ b/src/elements/paginator.rs @@ -10,7 +10,6 @@ use crate::{ pub struct Paginator { children: Vec>, - size: (u16, u16), index: usize, } @@ -18,7 +17,6 @@ impl Paginator { pub fn new() -> Self { Self { children: Vec::new(), - size: (0, 0), index: 0, } } @@ -27,28 +25,20 @@ impl Paginator { impl Element for Paginator { fn render( &mut self, - scope: &mut crate::render_scope::RenderScope, - _: &crate::render_scope::RenderContext, - ) { - let (width, height) = scope.get_size_or(self.size.0, self.size.1); - scope.use_area(width, height); - } - - fn after_render( - &mut self, - scope: &mut crate::render_scope::RenderScope, + parent_scope: &mut crate::render_scope::RenderScope, render_context: &crate::render_scope::RenderContext, ) { if let Some(widget) = self.children.get(self.index) { - let mut transform = scope.get_transform().clone(); - let mut renderer = DivRenderer(&mut transform); - let (w, h) = scope.get_parent_size(); - scope.set_parent_size(renderer.0.width, renderer.0.height); + let mut transform = parent_scope.get_transform().clone(); + let (w, h) = parent_scope.get_size_or_parent(); + let mut scope = crate::render_scope::RenderScope::new(); + scope.set_parent_size(w, h); + + let mut renderer = DivRenderer(&mut transform); scope.render_widget(&mut renderer, render_context.get_context(), widget); - scope.set_parent_size(w, h); - self.size = (renderer.0.width, renderer.0.height); + parent_scope.use_area(w, h); } } From fd8e466830828165dab982ae012d946aec88b8df Mon Sep 17 00:00:00 2001 From: Leo dev Date: Sat, 1 Nov 2025 11:56:55 +0100 Subject: [PATCH 03/14] Parent transform --- examples/iter.rs | 35 +++++++++++++++++++++--- src/elements/div.rs | 17 +++++++++--- src/elements/flex.rs | 34 ++++++++++++++++++----- src/elements/paginator.rs | 7 ++--- src/lib.rs | 6 +++-- src/render_scope.rs | 57 ++++++++++++++++++++++----------------- src/utils.rs | 16 ++++++++--- 7 files changed, 126 insertions(+), 46 deletions(-) diff --git a/examples/iter.rs b/examples/iter.rs index f551d63..fc17ff1 100644 --- a/examples/iter.rs +++ b/examples/iter.rs @@ -20,13 +20,42 @@ pub fn app() -> Rsx { } rsx! { + // @transform! { + // height: 3 + // }; + // FlexRow { + // for item in items { + // static "{item}" + // } + // } + @transform! { height: 3 }; FlexRow { - for item in items { - static "{item}" - } + @transform! { + height: 1 + }; + @Style { foreground: None, background: Background::Solid(0xff0000) }; + Div { "yo" } + + @transform! { + height: 1 + }; + @Style { foreground: None, background: Background::Solid(0x00ff00) }; + Div { "gurt" } + + @transform! { + height: 1 + }; + @Style { foreground: None, background: Background::Solid(0x0000ff) }; + Div { "67" } + + @transform! { + height: 1 + }; + @Style { foreground: None, background: Background::Solid(0x0000ff) }; + Div { "41" } } } } diff --git a/src/elements/div.rs b/src/elements/div.rs index 631f6c2..b38a7da 100644 --- a/src/elements/div.rs +++ b/src/elements/div.rs @@ -11,34 +11,45 @@ pub struct DivRenderer<'a>(pub &'a mut RawTransform); pub struct Div { children: Vec>, + render: (u16, u16), } impl Div { pub fn new() -> Self { Div { children: Vec::new(), + render: (0, 0), } } } impl Element for Div { fn render( + &mut self, + scope: &mut crate::prelude::RenderScope, + _: &crate::render_scope::RenderContext, + ) { + scope.use_area(self.render.0, self.render.1); + } + + fn after_render( &mut self, parent_scope: &mut crate::render_scope::RenderScope, render_context: &crate::render_scope::RenderContext, ) { let mut transform = parent_scope.get_transform().clone(); - let (w, h) = parent_scope.get_size_or_parent(); + let mut transform2 = transform.clone(); + (transform2.width, transform2.height) = parent_scope.get_size_or_parent(); let mut scope = crate::render_scope::RenderScope::new(); - scope.set_parent_size(w, h); + scope.set_parent_transform(transform2.clone()); let mut renderer = DivRenderer(&mut transform); for widget in &self.children { scope.render_widget(&mut renderer, render_context.get_context(), widget); } - parent_scope.use_area(w, h); + self.render = (transform2.width, transform2.height); } fn draw_child(&mut self, element: &Arc) { diff --git a/src/elements/flex.rs b/src/elements/flex.rs index 6b7c9f4..eb0293e 100644 --- a/src/elements/flex.rs +++ b/src/elements/flex.rs @@ -13,11 +13,13 @@ pub struct ColumnRenderer<'a>(&'a mut RawTransform, u16, &'a mut u16); pub struct FlexRow { pub gap: u16, children: Vec>, + render: (u16, u16), } pub struct FlexCol { pub gap: u16, children: Vec>, + render: (u16, u16), } impl FlexRow { @@ -25,6 +27,7 @@ impl FlexRow { Self { children: Vec::new(), gap: 0, + render: (0, 0), } } } @@ -34,21 +37,31 @@ impl FlexCol { Self { children: Vec::new(), gap: 0, + render: (0, 0), } } } impl Element for FlexRow { fn render( + &mut self, + scope: &mut crate::prelude::RenderScope, + _: &crate::render_scope::RenderContext, + ) { + scope.use_area(self.render.0, self.render.1); + } + + fn after_render( &mut self, parent_scope: &mut crate::render_scope::RenderScope, render_context: &crate::render_scope::RenderContext, ) { let mut transform = parent_scope.get_transform().clone(); - let (w, h) = parent_scope.get_size_or_parent(); + let mut transform2 = transform.clone(); + (transform2.width, transform2.height) = parent_scope.get_size_or_parent(); let mut scope = crate::render_scope::RenderScope::new(); - scope.set_parent_size(w, h); + scope.set_parent_transform(transform2.clone()); let mut v = 0; let mut renderer = RowRenderer(&mut transform, self.gap, &mut v); @@ -56,7 +69,7 @@ impl Element for FlexRow { scope.render_widget(&mut renderer, render_context.get_context(), widget); } - parent_scope.use_area(w, h); + self.render = (transform2.width, transform2.height); } fn draw_child(&mut self, element: &Arc) { @@ -85,15 +98,24 @@ impl Element for FlexRow { impl Element for FlexCol { fn render( + &mut self, + scope: &mut crate::prelude::RenderScope, + _: &crate::render_scope::RenderContext, + ) { + scope.use_area(self.render.0, self.render.1); + } + + fn after_render( &mut self, parent_scope: &mut crate::render_scope::RenderScope, render_context: &crate::render_scope::RenderContext, ) { let mut transform = parent_scope.get_transform().clone(); - let (w, h) = parent_scope.get_size_or_parent(); + let mut transform2 = transform.clone(); + (transform2.width, transform2.height) = parent_scope.get_size_or_parent(); let mut scope = crate::render_scope::RenderScope::new(); - scope.set_parent_size(w, h); + scope.set_parent_transform(transform2.clone()); let mut v = 0; let mut renderer = ColumnRenderer(&mut transform, self.gap, &mut v); @@ -101,7 +123,7 @@ impl Element for FlexCol { scope.render_widget(&mut renderer, render_context.get_context(), widget); } - parent_scope.use_area(w, h); + self.render = (transform2.width, transform2.height); } fn draw_child(&mut self, element: &Arc) { diff --git a/src/elements/paginator.rs b/src/elements/paginator.rs index 2ee034f..662db87 100644 --- a/src/elements/paginator.rs +++ b/src/elements/paginator.rs @@ -30,15 +30,16 @@ impl Element for Paginator { ) { if let Some(widget) = self.children.get(self.index) { let mut transform = parent_scope.get_transform().clone(); - let (w, h) = parent_scope.get_size_or_parent(); + let mut transform2 = transform.clone(); + (transform2.width, transform2.height) = parent_scope.get_size_or_parent(); let mut scope = crate::render_scope::RenderScope::new(); - scope.set_parent_size(w, h); + scope.set_parent_transform(transform2.clone()); let mut renderer = DivRenderer(&mut transform); scope.render_widget(&mut renderer, render_context.get_context(), widget); - parent_scope.use_area(w, h); + parent_scope.use_area(transform2.width, transform2.height); } } diff --git a/src/lib.rs b/src/lib.rs index c432b16..caaaf6d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -36,6 +36,7 @@ use crate::{ prelude::{Context, ElementRenderer}, render_scope::RenderScope, state::DependencyHandler, + style::RawTransform, widget::{BoxedElement, DynWidget, Element, StaticWidget, Widget, WidgetLoad}, }; @@ -190,8 +191,9 @@ impl Screen { pub fn render(self: &Arc, ctx: &Context) -> std::io::Result<()> { let mut scope = RenderScope::new(); let mut renderer = ScreenRenderer; - let (w, h) = crossterm::terminal::size().unwrap(); - scope.set_parent_size(w, h); + let mut transform = RawTransform::new(); + (transform.width, transform.height) = crossterm::terminal::size().unwrap(); + scope.set_parent_transform(transform); ctx.render_root(&mut scope); utils::clear()?; diff --git a/src/render_scope.rs b/src/render_scope.rs index 9207f60..02429bc 100644 --- a/src/render_scope.rs +++ b/src/render_scope.rs @@ -44,9 +44,8 @@ enum RenderMethod { #[derive(Clone)] pub struct RenderScope { transform: RawTransform, + parent_transform: RawTransform, render_stack: Vec, - parent_width: u16, - parent_height: u16, style: Style, } @@ -79,9 +78,8 @@ impl RenderScope { pub fn new() -> RenderScope { RenderScope { transform: RawTransform::new(), + parent_transform: RawTransform::new(), render_stack: Vec::new(), - parent_width: 0, - parent_height: 0, style: Style::new(), } } @@ -93,8 +91,16 @@ impl RenderScope { /// Applies a `Transform` to this scope, factoring in parent dimensions. pub fn set_transform(&mut self, transform: &Transform) { - transform.use_dimensions(self.parent_width, self.parent_height, &mut self.transform); - transform.use_position(self.parent_width, self.parent_height, &mut self.transform); + transform.use_dimensions( + self.parent_transform.width, + self.parent_transform.height, + &mut self.transform, + ); + transform.use_position( + self.parent_transform.width, + self.parent_transform.height, + &mut self.transform, + ); self.transform.px = transform.px; self.transform.py = transform.py; } @@ -164,7 +170,7 @@ impl RenderScope { format!("\n│{}│", " ".repeat(width as usize - 2)) .repeat(height as usize - 2), ), - (self.parent_width, self.parent_height), + &self.parent_transform, ); } } @@ -182,7 +188,7 @@ impl RenderScope { format!("\n│{}│", " ".repeat(width as usize - 2)) .repeat(height as usize - 2), ), - (self.parent_width, self.parent_height), + &self.parent_transform, ); } } @@ -194,30 +200,27 @@ impl RenderScope { .take(height as usize) .collect::>() .join("\n"), - (self.parent_width, self.parent_height), + &self.parent_transform, ), } for m in &self.render_stack { match m { RenderMethod::Text(x, y, t) => { - if *y + self.transform.y >= self.parent_height { - continue; - } if let Some(c) = self.style.foreground { utils::print_liner( self.transform.x + self.transform.px + x, self.transform.y + self.transform.py + y, &utils::hex_ansi(c), t, - (self.parent_width, self.parent_height), + &self.parent_transform, ); } else { utils::print( self.transform.x + self.transform.px, self.transform.y + self.transform.py, t, - (self.parent_width, self.parent_height), + &self.parent_transform, ); } } @@ -228,14 +231,14 @@ impl RenderScope { self.transform.y + self.transform.py + y, &utils::hex_ansi_bg(c), t, - (self.parent_width, self.parent_height), + &self.parent_transform, ); } else { utils::print( self.transform.x + self.transform.px, self.transform.y + self.transform.py, t, - (self.parent_width, self.parent_height), + &self.parent_transform, ); } } @@ -244,7 +247,7 @@ impl RenderScope { self.transform.y + self.transform.py + y, &utils::hex_ansi(*c), t, - (self.parent_width, self.parent_height), + &self.parent_transform, ), RenderMethod::Rectangle(x, y, width, height, color) => utils::print_liner( self.transform.x + self.transform.px + x, @@ -254,7 +257,7 @@ impl RenderScope { .take(*height as usize) .collect::>() .join("\n"), - (self.parent_width, self.parent_height), + &self.parent_transform, ), } } @@ -292,12 +295,12 @@ impl RenderScope { pub fn get_size_or_parent(&self) -> (u16, u16) { ( if self.transform.width == 0 { - self.parent_width + self.parent_transform.width } else { self.transform.width }, if self.transform.height == 0 { - self.parent_height + self.parent_transform.height } else { self.transform.height }, @@ -305,14 +308,18 @@ impl RenderScope { } /// Gets the dimensions of the parent container. - pub fn get_parent_size(&self) -> (u16, u16) { - (self.parent_width, self.parent_height) + pub fn get_parent_transform(&self) -> &RawTransform { + &self.parent_transform } /// Sets the dimensions of the parent container. - pub fn set_parent_size(&mut self, width: u16, height: u16) { - self.parent_width = width; - self.parent_height = height; + // pub fn set_parent_size(&mut self, width: u16, height: u16) { + // self.parent_transform.width = width; + // self.parent_transform.height = height; + // } + + pub fn set_parent_transform(&mut self, transform: RawTransform) { + self.parent_transform = transform; } /// Returns a mutable reference to the internal raw transform. diff --git a/src/utils.rs b/src/utils.rs index 4a20819..2a1edc8 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -3,6 +3,8 @@ use std::io::{self, Write}; +use crate::style::RawTransform; + /// Clears the terminal screen and moves the cursor to the top-left corner. /// /// # Returns @@ -107,9 +109,9 @@ pub fn hex_ansi_bg(hex: u32) -> String { format!("\x1b[48;2;{r};{g};{b}m") } -pub(crate) fn print(x: u16, y: u16, text: &str, area: (u16, u16)) { +pub(crate) fn print(x: u16, y: u16, text: &str, parent_transform: &RawTransform) { for (i, line) in text.lines().enumerate() { - if y + i as u16 >= area.1 { + if y + i as u16 >= parent_transform.height + parent_transform.y { break; } print!("\x1b[{};{}H{line}\x1b[0m", y + i as u16 + 1, x + 1); @@ -117,9 +119,15 @@ pub(crate) fn print(x: u16, y: u16, text: &str, area: (u16, u16)) { } } -pub(crate) fn print_liner(x: u16, y: u16, liner: &str, text: &str, area: (u16, u16)) { +pub(crate) fn print_liner( + x: u16, + y: u16, + liner: &str, + text: &str, + parent_transform: &RawTransform, +) { for (i, line) in text.lines().enumerate() { - if y + i as u16 >= area.1 { + if y + i as u16 >= parent_transform.height + parent_transform.y { break; } print!("\x1b[{};{}H{liner}{line}\x1b[0m", y + i as u16 + 1, x + 1); From dbb8a0e01acfe89d4971979339d3e9a4a39cad91 Mon Sep 17 00:00:00 2001 From: Leo dev Date: Sat, 1 Nov 2025 12:40:30 +0100 Subject: [PATCH 04/14] Fixed area rendering and merging issues --- examples/iter.rs | 55 ++++++++++++++------------------------------ src/elements/div.rs | 16 +++++++++---- src/elements/flex.rs | 30 ++++++++++++++++-------- src/style.rs | 13 +++++++++++ 4 files changed, 61 insertions(+), 53 deletions(-) diff --git a/examples/iter.rs b/examples/iter.rs index fc17ff1..457278c 100644 --- a/examples/iter.rs +++ b/examples/iter.rs @@ -9,53 +9,32 @@ fn main() -> std::io::Result<()> { } pub fn app() -> Rsx { - let items: State> = use_state(vec![1, 2]); - let count = use_state(3); + let items: State> = use_state(Vec::new()); + let count = use_state(1); + + run! { + ref count { + loop { + if count.get_dl() == 5 { + break; + } + std::thread::sleep(std::time::Duration::from_millis(300)); + **count.get() += 1; + } + } + } run! { use count ref items { items.get().push(count.get_dl()); - **count.get() += 1; } } rsx! { - // @transform! { - // height: 3 - // }; - // FlexRow { - // for item in items { - // static "{item}" - // } - // } - - @transform! { - height: 3 - }; FlexRow { - @transform! { - height: 1 - }; - @Style { foreground: None, background: Background::Solid(0xff0000) }; - Div { "yo" } - - @transform! { - height: 1 - }; - @Style { foreground: None, background: Background::Solid(0x00ff00) }; - Div { "gurt" } - - @transform! { - height: 1 - }; - @Style { foreground: None, background: Background::Solid(0x0000ff) }; - Div { "67" } - - @transform! { - height: 1 - }; - @Style { foreground: None, background: Background::Solid(0x0000ff) }; - Div { "41" } + for item in items { + static "{item}" + } } } } diff --git a/src/elements/div.rs b/src/elements/div.rs index b38a7da..69e8d7a 100644 --- a/src/elements/div.rs +++ b/src/elements/div.rs @@ -37,19 +37,25 @@ impl Element for Div { parent_scope: &mut crate::render_scope::RenderScope, render_context: &crate::render_scope::RenderContext, ) { - let mut transform = parent_scope.get_transform().clone(); - let mut transform2 = transform.clone(); - (transform2.width, transform2.height) = parent_scope.get_size_or_parent(); + let mut transform = { + let (width, height) = parent_scope.get_size_or_parent(); + let mut t = parent_scope.get_transform().clone(); + t.width = width; + t.height = height; + t.transform_parent(parent_scope.get_parent_transform()); + t + }; let mut scope = crate::render_scope::RenderScope::new(); - scope.set_parent_transform(transform2.clone()); + scope.set_parent_transform(transform.clone()); + transform.height = 0; let mut renderer = DivRenderer(&mut transform); for widget in &self.children { scope.render_widget(&mut renderer, render_context.get_context(), widget); } - self.render = (transform2.width, transform2.height); + self.render = (transform.width, transform.height); } fn draw_child(&mut self, element: &Arc) { diff --git a/src/elements/flex.rs b/src/elements/flex.rs index eb0293e..f15e881 100644 --- a/src/elements/flex.rs +++ b/src/elements/flex.rs @@ -56,12 +56,17 @@ impl Element for FlexRow { parent_scope: &mut crate::render_scope::RenderScope, render_context: &crate::render_scope::RenderContext, ) { - let mut transform = parent_scope.get_transform().clone(); - let mut transform2 = transform.clone(); - (transform2.width, transform2.height) = parent_scope.get_size_or_parent(); + let mut transform = { + let (width, height) = parent_scope.get_size_or_parent(); + let mut t = parent_scope.get_transform().clone(); + t.width = width; + t.height = height; + t.transform_parent(parent_scope.get_parent_transform()); + t + }; let mut scope = crate::render_scope::RenderScope::new(); - scope.set_parent_transform(transform2.clone()); + scope.set_parent_transform(transform.clone()); let mut v = 0; let mut renderer = RowRenderer(&mut transform, self.gap, &mut v); @@ -69,7 +74,7 @@ impl Element for FlexRow { scope.render_widget(&mut renderer, render_context.get_context(), widget); } - self.render = (transform2.width, transform2.height); + self.render = (transform.width, transform.height); } fn draw_child(&mut self, element: &Arc) { @@ -110,12 +115,17 @@ impl Element for FlexCol { parent_scope: &mut crate::render_scope::RenderScope, render_context: &crate::render_scope::RenderContext, ) { - let mut transform = parent_scope.get_transform().clone(); - let mut transform2 = transform.clone(); - (transform2.width, transform2.height) = parent_scope.get_size_or_parent(); + let mut transform = { + let (width, height) = parent_scope.get_size_or_parent(); + let mut t = parent_scope.get_transform().clone(); + t.width = width; + t.height = height; + t.transform_parent(parent_scope.get_parent_transform()); + t + }; let mut scope = crate::render_scope::RenderScope::new(); - scope.set_parent_transform(transform2.clone()); + scope.set_parent_transform(transform.clone()); let mut v = 0; let mut renderer = ColumnRenderer(&mut transform, self.gap, &mut v); @@ -123,7 +133,7 @@ impl Element for FlexCol { scope.render_widget(&mut renderer, render_context.get_context(), widget); } - self.render = (transform2.width, transform2.height); + self.render = (transform.width, transform.height); } fn draw_child(&mut self, element: &Arc) { diff --git a/src/style.rs b/src/style.rs index 6296754..691befc 100644 --- a/src/style.rs +++ b/src/style.rs @@ -171,6 +171,19 @@ impl RawTransform { py: 0, } } + + pub fn transform_parent(&mut self, parent: &Self) { + let child_bottom = self.y + self.height; + let parent_bottom = parent.y + parent.height; + + if child_bottom > parent_bottom { + if parent_bottom > self.y { + self.height = parent_bottom - self.y; + } else { + self.height = 0; + } + } + } } impl Dimension { From f41a4936f92e2cb2a58330f6c9a6a3e2803ae1f1 Mon Sep 17 00:00:00 2001 From: Leo dev Date: Sat, 1 Nov 2025 12:45:46 +0100 Subject: [PATCH 05/14] Fixed paginator render --- src/elements/paginator.rs | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/src/elements/paginator.rs b/src/elements/paginator.rs index 662db87..7ff6270 100644 --- a/src/elements/paginator.rs +++ b/src/elements/paginator.rs @@ -11,6 +11,7 @@ use crate::{ pub struct Paginator { children: Vec>, index: usize, + render: (u16, u16), } impl Paginator { @@ -18,28 +19,43 @@ impl Paginator { Self { children: Vec::new(), index: 0, + render: (0, 0), } } } impl Element for Paginator { fn render( + &mut self, + scope: &mut crate::prelude::RenderScope, + _: &crate::render_scope::RenderContext, + ) { + scope.use_area(self.render.0, self.render.1); + } + + fn after_render( &mut self, parent_scope: &mut crate::render_scope::RenderScope, render_context: &crate::render_scope::RenderContext, ) { if let Some(widget) = self.children.get(self.index) { - let mut transform = parent_scope.get_transform().clone(); - let mut transform2 = transform.clone(); - (transform2.width, transform2.height) = parent_scope.get_size_or_parent(); + let mut transform = { + let (width, height) = parent_scope.get_size_or_parent(); + let mut t = parent_scope.get_transform().clone(); + t.width = width; + t.height = height; + t.transform_parent(parent_scope.get_parent_transform()); + t + }; let mut scope = crate::render_scope::RenderScope::new(); - scope.set_parent_transform(transform2.clone()); + scope.set_parent_transform(transform.clone()); + transform.height = 0; let mut renderer = DivRenderer(&mut transform); scope.render_widget(&mut renderer, render_context.get_context(), widget); - parent_scope.use_area(transform2.width, transform2.height); + self.render = (transform.width, transform.height); } } From 5cb6d341af3dec71cc0eef472fddef8c7d6ab39e Mon Sep 17 00:00:00 2001 From: Leo dev Date: Sat, 1 Nov 2025 12:49:57 +0100 Subject: [PATCH 06/14] Even width and height comparisons --- src/elements/div.rs | 1 + src/style.rs | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/src/elements/div.rs b/src/elements/div.rs index 69e8d7a..79824da 100644 --- a/src/elements/div.rs +++ b/src/elements/div.rs @@ -49,6 +49,7 @@ impl Element for Div { let mut scope = crate::render_scope::RenderScope::new(); scope.set_parent_transform(transform.clone()); + transform.width = 0; transform.height = 0; let mut renderer = DivRenderer(&mut transform); for widget in &self.children { diff --git a/src/style.rs b/src/style.rs index 691befc..229ed39 100644 --- a/src/style.rs +++ b/src/style.rs @@ -176,6 +176,9 @@ impl RawTransform { let child_bottom = self.y + self.height; let parent_bottom = parent.y + parent.height; + let child_right = self.x + self.width; + let parent_right = parent.x + parent.width; + if child_bottom > parent_bottom { if parent_bottom > self.y { self.height = parent_bottom - self.y; @@ -183,6 +186,14 @@ impl RawTransform { self.height = 0; } } + + if child_right > parent_right { + if parent_right > self.x { + self.width = parent_right - self.x; + } else { + self.width = 0; + } + } } } From 2d41f3b50b649ad0dd76d85e45f8c7d662b83bfe Mon Sep 17 00:00:00 2001 From: Leo dev Date: Sat, 1 Nov 2025 13:02:10 +0100 Subject: [PATCH 07/14] Fixed padding --- src/utils.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utils.rs b/src/utils.rs index 2a1edc8..f3dd66f 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -111,7 +111,7 @@ pub fn hex_ansi_bg(hex: u32) -> String { pub(crate) fn print(x: u16, y: u16, text: &str, parent_transform: &RawTransform) { for (i, line) in text.lines().enumerate() { - if y + i as u16 >= parent_transform.height + parent_transform.y { + if y + i as u16 >= parent_transform.height + parent_transform.y + parent_transform.py { break; } print!("\x1b[{};{}H{line}\x1b[0m", y + i as u16 + 1, x + 1); @@ -127,7 +127,7 @@ pub(crate) fn print_liner( parent_transform: &RawTransform, ) { for (i, line) in text.lines().enumerate() { - if y + i as u16 >= parent_transform.height + parent_transform.y { + if y + i as u16 >= parent_transform.height + parent_transform.y + parent_transform.py { break; } print!("\x1b[{};{}H{liner}{line}\x1b[0m", y + i as u16 + 1, x + 1); From a2350f10f5107ae10d441096cdbb71480fa22411 Mon Sep 17 00:00:00 2001 From: Leo dev Date: Sat, 1 Nov 2025 13:30:41 +0100 Subject: [PATCH 08/14] Dynamic flex size --- examples/tour.rs | 1 - src/elements/flex.rs | 10 ++++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/examples/tour.rs b/examples/tour.rs index ffeed5b..bae1f6f 100644 --- a/examples/tour.rs +++ b/examples/tour.rs @@ -70,7 +70,6 @@ pub fn app(screen: Arc) -> Rsx { Input { } } - @Transform::new().margin(0, 1); FlexRow { "Password" diff --git a/src/elements/flex.rs b/src/elements/flex.rs index f15e881..d82f601 100644 --- a/src/elements/flex.rs +++ b/src/elements/flex.rs @@ -68,6 +68,7 @@ impl Element for FlexRow { let mut scope = crate::render_scope::RenderScope::new(); scope.set_parent_transform(transform.clone()); + transform.height = 0; let mut v = 0; let mut renderer = RowRenderer(&mut transform, self.gap, &mut v); for widget in &self.children { @@ -127,6 +128,7 @@ impl Element for FlexCol { let mut scope = crate::render_scope::RenderScope::new(); scope.set_parent_transform(transform.clone()); + transform.width = 0; let mut v = 0; let mut renderer = ColumnRenderer(&mut transform, self.gap, &mut v); for widget in &self.children { @@ -158,7 +160,7 @@ impl ElementRenderer for RowRenderer<'_> { fn before_draw(&mut self, scope: &mut crate::prelude::RenderScope, _widget: &Arc) { let t = scope.get_transform_mut(); self.0.width = self.0.width.max(*self.2 + t.width + (t.px * 2)); - self.0.height = self.0.height.max(t.height + (t.py * 2)); + // self.0.height = self.0.height.max(t.height + (t.py * 2)); t.x += self.0.x; t.y += self.0.y + *self.2; @@ -166,13 +168,15 @@ impl ElementRenderer for RowRenderer<'_> { t.px += self.0.px; t.py += self.0.py; + + self.0.height += t.height + (t.py * 2) + self.1; } } impl ElementRenderer for ColumnRenderer<'_> { fn before_draw(&mut self, scope: &mut crate::prelude::RenderScope, _widget: &Arc) { let t = scope.get_transform_mut(); - self.0.width = self.0.width.max(*self.2 + t.width + (t.px * 2)); + // self.0.width = self.0.width.max(*self.2 + t.width + (t.px * 2)); self.0.height = self.0.height.max(t.height + (t.py * 2)); t.x += self.0.x + *self.2; @@ -181,5 +185,7 @@ impl ElementRenderer for ColumnRenderer<'_> { t.px += self.0.px; t.py += self.0.py; + + self.0.width += t.width + (t.px * 2) + self.1; } } From 72e8df007ec279f260bbe410d270b70c9d73ee98 Mon Sep 17 00:00:00 2001 From: Leo dev Date: Sat, 1 Nov 2025 15:14:54 +0100 Subject: [PATCH 09/14] Scroll --- examples/iter.rs | 30 ++++++++--- src/elements/div.rs | 1 + src/elements/flex.rs | 2 + src/elements/mod.rs | 2 + src/elements/scroll.rs | 120 +++++++++++++++++++++++++++++++++++++++++ src/style.rs | 2 + src/utils.rs | 18 +++++-- 7 files changed, 165 insertions(+), 10 deletions(-) create mode 100644 src/elements/scroll.rs diff --git a/examples/iter.rs b/examples/iter.rs index 457278c..9661634 100644 --- a/examples/iter.rs +++ b/examples/iter.rs @@ -1,24 +1,27 @@ +use std::sync::Arc; + use osui::prelude::*; fn main() -> std::io::Result<()> { let screen = Screen::new(); + screen.extension(InputExtension); - app().draw(&screen); + app(screen.clone()).draw(&screen); screen.run() } -pub fn app() -> Rsx { +pub fn app(screen: Arc) -> Rsx { let items: State> = use_state(Vec::new()); let count = use_state(1); run! { ref count { loop { - if count.get_dl() == 5 { + if count.get_dl() == 20 { break; } - std::thread::sleep(std::time::Duration::from_millis(300)); + std::thread::sleep(std::time::Duration::from_millis(200)); **count.get() += 1; } } @@ -31,9 +34,22 @@ pub fn app() -> Rsx { } rsx! { - FlexRow { - for item in items { - static "{item}" + @AlwaysFocused; + @Handler::new({ + let screen = screen.clone(); + move |_, e: &crossterm::event::Event| { + if let crossterm::event::Event::Key(crossterm::event::KeyEvent { code, .. }) = e { + if *code == crossterm::event::KeyCode::Esc { + screen.close(); + } + } + } + }); + Scroll { + FlexRow { + for item in items { + static "{item}" + } } } } diff --git a/src/elements/div.rs b/src/elements/div.rs index 79824da..efd5478 100644 --- a/src/elements/div.rs +++ b/src/elements/div.rs @@ -84,5 +84,6 @@ impl ElementRenderer for DivRenderer<'_> { self.0.height = self.0.height.max(t.height + (t.py * 2)); t.x += self.0.x + self.0.px; t.y += self.0.y + self.0.py; + t.offset_y = self.0.offset_y; } } diff --git a/src/elements/flex.rs b/src/elements/flex.rs index d82f601..53b5665 100644 --- a/src/elements/flex.rs +++ b/src/elements/flex.rs @@ -170,6 +170,7 @@ impl ElementRenderer for RowRenderer<'_> { t.py += self.0.py; self.0.height += t.height + (t.py * 2) + self.1; + t.offset_y = self.0.offset_y; } } @@ -187,5 +188,6 @@ impl ElementRenderer for ColumnRenderer<'_> { t.py += self.0.py; self.0.width += t.width + (t.px * 2) + self.1; + t.offset_y = self.0.offset_y; } } diff --git a/src/elements/mod.rs b/src/elements/mod.rs index f7edd3e..f408d11 100644 --- a/src/elements/mod.rs +++ b/src/elements/mod.rs @@ -3,12 +3,14 @@ pub mod flex; pub mod heading; pub mod input; pub mod paginator; +pub mod scroll; pub use div::*; pub use flex::*; pub use heading::*; pub use input::*; pub use paginator::*; +pub use scroll::*; use crate::Element; diff --git a/src/elements/scroll.rs b/src/elements/scroll.rs new file mode 100644 index 0000000..910c0c5 --- /dev/null +++ b/src/elements/scroll.rs @@ -0,0 +1,120 @@ +use std::sync::Arc; + +use crossterm::event::Event; + +use crate::{ + prelude::ElementRenderer, + style::RawTransform, + widget::{Element, Widget}, + NoRenderRoot, +}; + +pub struct ScrollRenderer<'a>(&'a mut RawTransform); + +pub struct Scroll { + pub scroll_offset: u16, + children: Vec>, + render: (u16, u16), +} + +impl Scroll { + pub fn new() -> Self { + Self { + scroll_offset: 0, + children: Vec::new(), + render: (0, 0), + } + } +} + +impl Element for Scroll { + fn render( + &mut self, + scope: &mut crate::prelude::RenderScope, + _: &crate::render_scope::RenderContext, + ) { + scope.use_area(self.render.0, self.render.1); + } + + fn after_render( + &mut self, + parent_scope: &mut crate::render_scope::RenderScope, + render_context: &crate::render_scope::RenderContext, + ) { + let mut transform = { + let (width, height) = parent_scope.get_size_or_parent(); + let mut t = parent_scope.get_transform().clone(); + t.width = width; + t.height = height; + t.transform_parent(parent_scope.get_parent_transform()); + t + }; + + transform.offset_y = self.scroll_offset; + + let mut scope = crate::render_scope::RenderScope::new(); + scope.set_parent_transform(transform.clone()); + + transform.width = 0; + transform.height = 0; + let mut renderer = ScrollRenderer(&mut transform); + for widget in &self.children { + scope.render_widget(&mut renderer, render_context.get_context(), widget); + } + + self.render = (transform.width, transform.height); + } + + fn draw_child(&mut self, element: &Arc) { + self.children.push(element.clone()); + element.inject(|w| w.component(NoRenderRoot)); + } + + fn undraw_child(&mut self, element: &Arc) { + if let Some(i) = self.children.iter().position(|v| Arc::ptr_eq(v, element)) { + self.children.remove(i); + } + } + + fn event(&mut self, event: &dyn crate::prelude::Event) { + if let Some(e) = event.get::() { + match e { + Event::Key(k) => match k.code { + crossterm::event::KeyCode::Up => { + self.scroll_offset = self.scroll_offset.saturating_sub(1) + } + crossterm::event::KeyCode::Down => { + if self.scroll_offset + 1 < self.render.1 { + self.scroll_offset += 1; + } + } + _ => {} + }, + _ => {} + } + } + } + + fn is_ghost(&mut self) -> bool { + true + } + + fn as_any(&self) -> &dyn std::any::Any { + self + } + + fn as_any_mut(&mut self) -> &mut dyn std::any::Any { + self + } +} + +impl ElementRenderer for ScrollRenderer<'_> { + fn before_draw(&mut self, scope: &mut crate::prelude::RenderScope, _widget: &Arc) { + let t = scope.get_transform_mut(); + self.0.width = self.0.width.max(t.width + (t.px * 2)); + self.0.height = self.0.height.max(t.height + (t.py * 2)); + t.x += self.0.x + self.0.px; + t.y += self.0.y + self.0.py; + t.offset_y = self.0.offset_y; + } +} diff --git a/src/style.rs b/src/style.rs index 229ed39..a7abc1d 100644 --- a/src/style.rs +++ b/src/style.rs @@ -19,6 +19,7 @@ pub struct RawTransform { pub height: u16, pub px: u16, pub py: u16, + pub offset_y: u16, } /// Horizontal or vertical position relative to a parent container. @@ -169,6 +170,7 @@ impl RawTransform { height: 0, px: 0, py: 0, + offset_y: 0, } } diff --git a/src/utils.rs b/src/utils.rs index f3dd66f..da5e8f9 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -111,10 +111,16 @@ pub fn hex_ansi_bg(hex: u32) -> String { pub(crate) fn print(x: u16, y: u16, text: &str, parent_transform: &RawTransform) { for (i, line) in text.lines().enumerate() { - if y + i as u16 >= parent_transform.height + parent_transform.y + parent_transform.py { + if parent_transform.offset_y > y + i as u16 { + continue; + } + + let y = y + i as u16 - parent_transform.offset_y; + + if y >= parent_transform.height + parent_transform.y + parent_transform.py { break; } - print!("\x1b[{};{}H{line}\x1b[0m", y + i as u16 + 1, x + 1); + print!("\x1b[{};{}H{line}\x1b[0m", y + 1, x + 1); flush().unwrap(); } } @@ -127,10 +133,16 @@ pub(crate) fn print_liner( parent_transform: &RawTransform, ) { for (i, line) in text.lines().enumerate() { + if parent_transform.offset_y > y + i as u16 { + continue; + } + + let y = y + i as u16 - parent_transform.offset_y; + if y + i as u16 >= parent_transform.height + parent_transform.y + parent_transform.py { break; } - print!("\x1b[{};{}H{liner}{line}\x1b[0m", y + i as u16 + 1, x + 1); + print!("\x1b[{};{}H{liner}{line}\x1b[0m", y + 1, x + 1); flush().unwrap(); } } From 23edb6c9174a1c24b698f72a8b0295ba5c5672bb Mon Sep 17 00:00:00 2001 From: Leo dev Date: Sat, 1 Nov 2025 15:30:03 +0100 Subject: [PATCH 10/14] Mouse input --- src/elements/scroll.rs | 16 ++++++++++++++-- src/extensions/input_handling.rs | 20 +++++++++++++++++++- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/src/elements/scroll.rs b/src/elements/scroll.rs index 910c0c5..3d760b7 100644 --- a/src/elements/scroll.rs +++ b/src/elements/scroll.rs @@ -80,16 +80,28 @@ impl Element for Scroll { if let Some(e) = event.get::() { match e { Event::Key(k) => match k.code { - crossterm::event::KeyCode::Up => { + crossterm::event::KeyCode::PageUp => { self.scroll_offset = self.scroll_offset.saturating_sub(1) } - crossterm::event::KeyCode::Down => { + crossterm::event::KeyCode::PageDown => { if self.scroll_offset + 1 < self.render.1 { self.scroll_offset += 1; } } _ => {} }, + + Event::Mouse(m) => match m.kind { + crossterm::event::MouseEventKind::ScrollDown => { + if self.scroll_offset + 1 < self.render.1 { + self.scroll_offset += 1; + } + } + crossterm::event::MouseEventKind::ScrollUp => { + self.scroll_offset = self.scroll_offset.saturating_sub(1) + } + _ => {} + }, _ => {} } } diff --git a/src/extensions/input_handling.rs b/src/extensions/input_handling.rs index 94156a6..8d80f0c 100644 --- a/src/extensions/input_handling.rs +++ b/src/extensions/input_handling.rs @@ -1,4 +1,14 @@ -use crate::extensions::{Extension, Context}; +use std::io::stdout; + +use crossterm::{ + event::{ + DisableMouseCapture, EnableMouseCapture, KeyboardEnhancementFlags, + PopKeyboardEnhancementFlags, PushKeyboardEnhancementFlags, + }, + execute, +}; + +use crate::extensions::{Context, Extension}; pub struct InputExtension; @@ -6,6 +16,12 @@ impl Extension for InputExtension { fn init(&mut self, ctx: &Context) { let ctx = ctx.clone(); crossterm::terminal::enable_raw_mode().unwrap(); + execute!( + stdout(), + PushKeyboardEnhancementFlags(KeyboardEnhancementFlags::DISAMBIGUATE_ESCAPE_CODES) + ) + .unwrap(); + execute!(stdout(), EnableMouseCapture).unwrap(); std::thread::spawn(move || loop { if let Ok(e) = crossterm::event::read() { ctx.event(&e); @@ -14,6 +30,8 @@ impl Extension for InputExtension { } fn on_close(&mut self) { + execute!(stdout(), PopKeyboardEnhancementFlags).unwrap(); + execute!(stdout(), DisableMouseCapture).unwrap(); crossterm::terminal::disable_raw_mode().unwrap(); } } From 6424ad3390891b47854cfded6491d8fd79d9eb42 Mon Sep 17 00:00:00 2001 From: Leo dev Date: Sat, 1 Nov 2025 16:58:10 +0100 Subject: [PATCH 11/14] Small change in iter --- examples/iter.rs | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/examples/iter.rs b/examples/iter.rs index 9661634..61162ca 100644 --- a/examples/iter.rs +++ b/examples/iter.rs @@ -16,23 +16,15 @@ pub fn app(screen: Arc) -> Rsx { let count = use_state(1); run! { - ref count { + ref count, items { loop { - if count.get_dl() == 20 { - break; - } - std::thread::sleep(std::time::Duration::from_millis(200)); + items.get().push(count.get_dl()); **count.get() += 1; + std::thread::sleep(std::time::Duration::from_millis(100)); } } } - run! { - use count ref items { - items.get().push(count.get_dl()); - } - } - rsx! { @AlwaysFocused; @Handler::new({ From c91a4732632a9d1262ca695c9b1d53ce4fb07029 Mon Sep 17 00:00:00 2001 From: Leo dev Date: Sat, 1 Nov 2025 22:47:16 +0100 Subject: [PATCH 12/14] Added auth example --- examples/auth.rs | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 examples/auth.rs diff --git a/examples/auth.rs b/examples/auth.rs new file mode 100644 index 0000000..61b70db --- /dev/null +++ b/examples/auth.rs @@ -0,0 +1,32 @@ +use std::sync::Arc; + +use osui::prelude::*; + +fn main() -> std::io::Result<()> { + let screen = Screen::new(); + + app(screen.clone()).draw(&screen); + + screen.run() +} + +pub fn app(_screen: Arc) -> Rsx { + rsx! { + FlexRow, gap: 1, { + @Style { foreground: Some(0xffffff), background: Background::Solid(0x00ff00) }; + FlexRow { + @Transform::new().padding(1, 1).dimensions(40, 1); + @Style { foreground: Some(0xffffff), background: Background::RoundedOutline(0xff0000) }; + @Focused; + Input { } + } + + // @Style { foreground: Some(0xffffff), background: Background::Solid(0x00ff00) }; + // FlexRow { + // @Transform::new().padding(1, 1).dimensions(40, 1); + // @Style { foreground: Some(0xffffff), background: Background::RoundedOutline(0xffff00) }; + // Input { } + // } + } + } +} From dbd16956dd5930a94ed70fb8c4f4422a5aa34e60 Mon Sep 17 00:00:00 2001 From: Leo dev Date: Sat, 1 Nov 2025 22:50:19 +0100 Subject: [PATCH 13/14] Seperated row and column flex --- src/elements/flex/column.rs | 98 +++++++++++++++++++++++++++ src/elements/flex/mod.rs | 5 ++ src/elements/{flex.rs => flex/row.rs} | 89 ------------------------ 3 files changed, 103 insertions(+), 89 deletions(-) create mode 100644 src/elements/flex/column.rs create mode 100644 src/elements/flex/mod.rs rename src/elements/{flex.rs => flex/row.rs} (53%) diff --git a/src/elements/flex/column.rs b/src/elements/flex/column.rs new file mode 100644 index 0000000..b1a4436 --- /dev/null +++ b/src/elements/flex/column.rs @@ -0,0 +1,98 @@ +use std::sync::Arc; + +use crate::{ + prelude::ElementRenderer, + style::RawTransform, + widget::{Element, Widget}, + NoRenderRoot, +}; + +pub struct ColumnRenderer<'a>(&'a mut RawTransform, u16, &'a mut u16); + +pub struct FlexCol { + pub gap: u16, + children: Vec>, + render: (u16, u16), +} + +impl FlexCol { + pub fn new() -> Self { + Self { + children: Vec::new(), + gap: 0, + render: (0, 0), + } + } +} + +impl Element for FlexCol { + fn render( + &mut self, + scope: &mut crate::prelude::RenderScope, + _: &crate::render_scope::RenderContext, + ) { + scope.use_area(self.render.0, self.render.1); + } + + fn after_render( + &mut self, + parent_scope: &mut crate::render_scope::RenderScope, + render_context: &crate::render_scope::RenderContext, + ) { + let mut transform = { + let (width, height) = parent_scope.get_size_or_parent(); + let mut t = parent_scope.get_transform().clone(); + t.width = width; + t.height = height; + t.transform_parent(parent_scope.get_parent_transform()); + t + }; + + let mut scope = crate::render_scope::RenderScope::new(); + scope.set_parent_transform(transform.clone()); + + transform.width = 0; + let mut v = 0; + let mut renderer = ColumnRenderer(&mut transform, self.gap, &mut v); + for widget in &self.children { + scope.render_widget(&mut renderer, render_context.get_context(), widget); + } + + self.render = (transform.width, transform.height); + } + + fn draw_child(&mut self, element: &Arc) { + self.children.push(element.clone()); + element.inject(|w| w.component(NoRenderRoot)); + } + + fn is_ghost(&mut self) -> bool { + true + } + + fn as_any(&self) -> &dyn std::any::Any { + self + } + + fn as_any_mut(&mut self) -> &mut dyn std::any::Any { + self + } +} + +impl ElementRenderer for ColumnRenderer<'_> { + fn before_draw(&mut self, scope: &mut crate::prelude::RenderScope, _widget: &Arc) { + let t = scope.get_transform_mut(); + // self.0.width = self.0.width.max(*self.2 + t.width + (t.px * 2)); + self.0.height = self.0.height.max(t.height + (t.py * 2)); + + t.x += self.0.x + *self.2; + t.y += self.0.y; + *self.2 += t.width + self.1 + (t.px * 2); + + t.px += self.0.px; + t.py += self.0.py; + + self.0.width += t.width + (t.px * 2) + self.1; + t.offset_y = self.0.offset_y; + } +} diff --git a/src/elements/flex/mod.rs b/src/elements/flex/mod.rs new file mode 100644 index 0000000..48c6444 --- /dev/null +++ b/src/elements/flex/mod.rs @@ -0,0 +1,5 @@ +mod row; +pub use row::*; + +mod column; +pub use column::*; diff --git a/src/elements/flex.rs b/src/elements/flex/row.rs similarity index 53% rename from src/elements/flex.rs rename to src/elements/flex/row.rs index 53b5665..902ceb3 100644 --- a/src/elements/flex.rs +++ b/src/elements/flex/row.rs @@ -8,7 +8,6 @@ use crate::{ }; pub struct RowRenderer<'a>(&'a mut RawTransform, u16, &'a mut u16); -pub struct ColumnRenderer<'a>(&'a mut RawTransform, u16, &'a mut u16); pub struct FlexRow { pub gap: u16, @@ -16,12 +15,6 @@ pub struct FlexRow { render: (u16, u16), } -pub struct FlexCol { - pub gap: u16, - children: Vec>, - render: (u16, u16), -} - impl FlexRow { pub fn new() -> Self { Self { @@ -32,16 +25,6 @@ impl FlexRow { } } -impl FlexCol { - pub fn new() -> Self { - Self { - children: Vec::new(), - gap: 0, - render: (0, 0), - } - } -} - impl Element for FlexRow { fn render( &mut self, @@ -102,60 +85,6 @@ impl Element for FlexRow { } } -impl Element for FlexCol { - fn render( - &mut self, - scope: &mut crate::prelude::RenderScope, - _: &crate::render_scope::RenderContext, - ) { - scope.use_area(self.render.0, self.render.1); - } - - fn after_render( - &mut self, - parent_scope: &mut crate::render_scope::RenderScope, - render_context: &crate::render_scope::RenderContext, - ) { - let mut transform = { - let (width, height) = parent_scope.get_size_or_parent(); - let mut t = parent_scope.get_transform().clone(); - t.width = width; - t.height = height; - t.transform_parent(parent_scope.get_parent_transform()); - t - }; - - let mut scope = crate::render_scope::RenderScope::new(); - scope.set_parent_transform(transform.clone()); - - transform.width = 0; - let mut v = 0; - let mut renderer = ColumnRenderer(&mut transform, self.gap, &mut v); - for widget in &self.children { - scope.render_widget(&mut renderer, render_context.get_context(), widget); - } - - self.render = (transform.width, transform.height); - } - - fn draw_child(&mut self, element: &Arc) { - self.children.push(element.clone()); - element.inject(|w| w.component(NoRenderRoot)); - } - - fn is_ghost(&mut self) -> bool { - true - } - - fn as_any(&self) -> &dyn std::any::Any { - self - } - - fn as_any_mut(&mut self) -> &mut dyn std::any::Any { - self - } -} - impl ElementRenderer for RowRenderer<'_> { fn before_draw(&mut self, scope: &mut crate::prelude::RenderScope, _widget: &Arc) { let t = scope.get_transform_mut(); @@ -173,21 +102,3 @@ impl ElementRenderer for RowRenderer<'_> { t.offset_y = self.0.offset_y; } } - -impl ElementRenderer for ColumnRenderer<'_> { - fn before_draw(&mut self, scope: &mut crate::prelude::RenderScope, _widget: &Arc) { - let t = scope.get_transform_mut(); - // self.0.width = self.0.width.max(*self.2 + t.width + (t.px * 2)); - self.0.height = self.0.height.max(t.height + (t.py * 2)); - - t.x += self.0.x + *self.2; - t.y += self.0.y; - *self.2 += t.width + self.1 + (t.px * 2); - - t.px += self.0.px; - t.py += self.0.py; - - self.0.width += t.width + (t.px * 2) + self.1; - t.offset_y = self.0.offset_y; - } -} From 0e3c1ccafe306109284847367395f861c5002b09 Mon Sep 17 00:00:00 2001 From: Leo dev Date: Sat, 1 Nov 2025 23:19:22 +0100 Subject: [PATCH 14/14] Fixed bad scissor --- examples/auth.rs | 32 -------------------------------- src/utils.rs | 2 +- 2 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 examples/auth.rs diff --git a/examples/auth.rs b/examples/auth.rs deleted file mode 100644 index 61b70db..0000000 --- a/examples/auth.rs +++ /dev/null @@ -1,32 +0,0 @@ -use std::sync::Arc; - -use osui::prelude::*; - -fn main() -> std::io::Result<()> { - let screen = Screen::new(); - - app(screen.clone()).draw(&screen); - - screen.run() -} - -pub fn app(_screen: Arc) -> Rsx { - rsx! { - FlexRow, gap: 1, { - @Style { foreground: Some(0xffffff), background: Background::Solid(0x00ff00) }; - FlexRow { - @Transform::new().padding(1, 1).dimensions(40, 1); - @Style { foreground: Some(0xffffff), background: Background::RoundedOutline(0xff0000) }; - @Focused; - Input { } - } - - // @Style { foreground: Some(0xffffff), background: Background::Solid(0x00ff00) }; - // FlexRow { - // @Transform::new().padding(1, 1).dimensions(40, 1); - // @Style { foreground: Some(0xffffff), background: Background::RoundedOutline(0xffff00) }; - // Input { } - // } - } - } -} diff --git a/src/utils.rs b/src/utils.rs index da5e8f9..59ebde8 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -139,7 +139,7 @@ pub(crate) fn print_liner( let y = y + i as u16 - parent_transform.offset_y; - if y + i as u16 >= parent_transform.height + parent_transform.y + parent_transform.py { + if y >= parent_transform.height + parent_transform.y + parent_transform.py { break; } print!("\x1b[{};{}H{liner}{line}\x1b[0m", y + 1, x + 1);