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

dynamic sizes

Browse Source
This commit is contained in:
selimaj-dev
2024-11-01 10:55:29 +01:00
parent bdec423a6f
commit 14261ab1e1
2 changed files with 51 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib.rs
+16
View File
@@ -65,11 +65,27 @@ impl App {
/// Render to the screen /// Render to the screen
pub fn render(&mut self) { pub fn render(&mut self) {
let (width, height) = crossterm::terminal::size().unwrap(); let (width, height) = crossterm::terminal::size().unwrap();
let mut data = self.element.get_data();
if data.width == 0 {
data.width = width as usize;
}
if data.height == 0 {
data.height = height as usize;
}
self.element.set_data(data);
let mut frame: Vec<String> = create_frame!(width as usize, height as usize); let mut frame: Vec<String> = create_frame!(width as usize, height as usize);
utils::render_to_frame(&mut frame, &mut self.element); utils::render_to_frame(&mut frame, &mut self.element);
utils::clear(); utils::clear();
print!("{}", frame.join("")); print!("{}", frame.join(""));
utils::flush(); utils::flush();
let mut data = self.element.get_data();
if data.width == width as usize {
data.width = 0;
}
if data.height == height as usize {
data.height = 0;
}
self.element.set_data(data);
} }
/// Run the screen /// Run the screen
src/ui/elements.rs
+35 -29
View File
@@ -7,32 +7,6 @@ use crate::{
Element, ElementData, UpdateResponse, Element, ElementData, UpdateResponse,
}; };
macro_rules! update_child_data {
($elem:ident, $child:ident, $i:expr) => {
let mut child_data = $child.get_data();
if child_data.width == 0 {
child_data.width = $elem.width;
}
if child_data.height == 0 {
child_data.height = $elem.height;
}
child_data.style.is_active = $elem.style.is_active && $i == $elem.child;
$child.set_data(child_data);
};
($elem:expr, $child:ident) => {
let mut child_data = $child.get_data();
if child_data.width == 0 {
child_data.width = $elem.width;
}
if child_data.height == 0 {
child_data.height = $elem.height;
}
child_data.style.is_active = true;
$child.set_data(child_data);
};
}
element! { element! {
Text {} Text {}
defaults {} defaults {}
@@ -99,8 +73,24 @@ element! {
fn render(&mut self) -> String { fn render(&mut self) -> String {
let mut frame: Vec<String> = create_frame!(self.width, self.height); let mut frame: Vec<String> = create_frame!(self.width, self.height);
for (i, child) in &mut self.children.iter_mut().enumerate() { for (i, child) in &mut self.children.iter_mut().enumerate() {
update_child_data!(self, child, i); let mut data = child.get_data();
if data.width == 0 {
data.width = self.width;
}
if data.height == 0 {
data.height = self.height;
}
data.style.is_active = self.style.is_active && i == self.child;
child.set_data(data);
crate::utils::render_to_frame(&mut frame, child); crate::utils::render_to_frame(&mut frame, child);
let mut data = child.get_data();
if data.width == self.width {
data.width = 0;
}
if data.height == self.height {
data.height = 0;
}
child.set_data(data);
} }
frame.join("\n") frame.join("\n")
} }
@@ -199,10 +189,26 @@ element! {
fn render(&mut self) -> String { fn render(&mut self) -> String {
let mut frame: Vec<String> = create_frame!(self.width, self.height - 1); let mut frame: Vec<String> = create_frame!(self.width, self.height - 1);
let d = self.get_data(); let this = self.get_data();
if let Some(child) = self.get_child() { if let Some(child) = self.get_child() {
update_child_data!(d, child); let mut data = child.get_data();
if data.width == 0 {
data.width = this.width;
}
if data.height == 0 {
data.height = this.height;
}
data.style.is_active = true;
child.set_data(data);
crate::utils::render_to_frame(&mut frame, child); crate::utils::render_to_frame(&mut frame, child);
let mut data = child.get_data();
if data.width == this.width {
data.width = 0;
}
if data.height == this.height {
data.height = 0;
}
child.set_data(data);
} }
let mut v: String = " ".repeat((self.width / 2) - self.children.len()); let mut v: String = " ".repeat((self.width / 2) - self.children.len());
for (i, _) in (&self.children).into_iter().enumerate() { for (i, _) in (&self.children).into_iter().enumerate() {