osui-rs/osui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Parent transform

Browse Source
This commit is contained in:
selimaj-dev
2025-11-01 11:56:55 +01:00
parent 29432a939b
commit fd8e466830
7 changed files with 126 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/iter.rs
+32 -3
View File
@@ -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" }
}
}
}
src/elements/div.rs
+14 -3
View File
@@ -11,34 +11,45 @@ pub struct DivRenderer<'a>(pub &'a mut RawTransform);
pub struct Div {
children: Vec<Arc<Widget>>,
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<Widget>) {
src/elements/flex.rs
+28 -6
View File
@@ -13,11 +13,13 @@ pub struct ColumnRenderer<'a>(&'a mut RawTransform, u16, &'a mut u16);
pub struct FlexRow {
pub gap: u16,
children: Vec<Arc<Widget>>,
render: (u16, u16),
}
pub struct FlexCol {
pub gap: u16,
children: Vec<Arc<Widget>>,
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<Widget>) {
@@ -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<Widget>) {
src/elements/paginator.rs
+4 -3
View File
@@ -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);
}
}
src/lib.rs
+4 -2
View File
@@ -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<Self>, 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()?;
src/render_scope.rs
+32 -25
View File
@@ -44,9 +44,8 @@ enum RenderMethod {
#[derive(Clone)]
pub struct RenderScope {
transform: RawTransform,
parent_transform: RawTransform,
render_stack: Vec<RenderMethod>,
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::<Vec<_>>()
.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::<Vec<_>>()
.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.
src/utils.rs
+12 -4
View File
@@ -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);