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

added outline support (still not done yet)

Browse Source
This commit is contained in:
selimaj-dev
2024-12-28 06:34:12 -06:00
parent dac3acdceb
commit 2cc029df91
4 changed files with 127 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib.rs
+84 -67
View File
@@ -119,6 +119,7 @@ pub struct Writer {
size: (u16, u16),
pos: (u16, u16),
written: (u16, u16),
parent: Option<*mut Writer>,
}
pub struct State<T>(Arc<Mutex<T>>);
@@ -178,16 +179,22 @@ impl Document {
pub fn render(&self) {
if !self.element.is_null() {
let (width, height) = crossterm::terminal::size().unwrap();
let mut writer = Writer::new(
true,
ui::StyleElement::default(),
(0, 0),
(width, height),
&self.css,
);
let mut writer = Writer {
css: &self.css,
focused: true,
style: ui::StyleElement {
// outline: (true, true),
..Default::default()
},
size: (width, height),
pos: (1, 1),
written: (0, 0),
parent: None,
};
let mut frame = writer.new_frame();
utils::clear();
frame.render(true, unsafe { &*self.element });
writer.after_render(width, height);
utils::flush();
}
}
@@ -352,73 +359,83 @@ impl<T> Handler<T> {
}
impl Writer {
pub fn new(
focused: bool,
style: ui::StyleElement,
pos: (u16, u16),
size: (u16, u16),
css: &ui::Css,
) -> Writer {
Writer {
css,
style,
focused,
size,
pos,
written: (0, 0),
pub fn after_render(&self, width: u16, height: u16) {
if self.style.outline.1 {
let ol = self.style.write_outline("│");
let hl = "─".repeat(width as usize - 2);
self.write_abs_outline(&self.style.write_outline(&format!("╭{}╮", hl)), (0, 0));
for i in 1..height {
self.write_abs_outline(&ol, (0, i));
self.write_abs_outline(&ol, (width - 1, i));
}
self.write_abs_outline(&self.style.write_outline(&format!("╰{}╯", hl)), (0, height));
}
}
pub fn write(&mut self, s: &str) {
let outline_ch = self.style.write_outline("│");
for (i, line) in s.lines().enumerate() {
if self.style.outline.1 {
print!(
"\x1B[{};{}H{outline_ch}{}",
self.pos.1 + 2 + i as u16,
self.pos.0 + 1,
self.style.write(line),
);
} else {
print!(
"\x1B[{};{}H{}",
self.pos.1 + 1 + i as u16,
self.pos.0 + 1,
self.style.write(line)
);
}
let line_len = line.len() as u16;
if line_len > self.written.0 {
self.written.0 = line_len;
}
self.written.1 += 1;
// let width = self.get_size().0 as usize;
// let s = s
// .lines()
// .map(|l| {
// if l.len() > width {
// l.chars().take(width).collect::<String>()
// } else {
// l.to_string()
// }
// })
// .collect::<Vec<String>>()
// .join("\n");
self.write_abs(&self.style.write(&s), (0, 0));
}
pub fn write_abs_outline(&self, s: &str, pos: (u16, u16)) {
if let Some(parent) = self.parent {
let parent = unsafe { &mut *parent };
parent.write_abs_outline(s, (self.pos.0 + pos.0, self.pos.1 + pos.1));
} else {
print!(
"\x1b[{};{}H{}",
self.pos.1 + pos.1 - 1,
self.pos.0 + pos.0 - 1,
self.style.write_outline(s)
);
}
}
if self.style.outline.1 {
print!(
"\x1B[{};{}H{}",
self.pos.1 + 1,
self.pos.0 + 1,
self.style.write_outline(&format!(
"╭{}╮",
"─".repeat(self.get_size_root().0 as usize)
))
);
print!(
"\x1B[{};{}H{}",
self.pos.1 + self.written.1 + 2,
self.pos.0 + 1,
self.style.write_outline(&format!(
"╰{}╯",
"─".repeat(self.get_size_root().0 as usize)
))
);
pub fn write_abs(&mut self, s: &str, pos: (u16, u16)) {
let width = self.get_size().0 as usize;
let mut max_written = self.written.0;
let mut lines_written = 0;
for i in 0..self.written.1 {
let truncated_lines: Vec<_> = s
.lines()
.map(|l| {
let truncated = if l.len() > width {
l.chars().take(width).collect::<String>()
} else {
l.to_string()
};
max_written = max_written.max(truncated.len() as u16);
lines_written += 1;
truncated
})
.collect();
self.written.0 = max_written;
self.written.1 += lines_written;
if let Some(parent) = self.parent {
let parent = unsafe { &mut *parent };
let combined_pos = (self.pos.0 + pos.0, self.pos.1 + pos.1);
let s_combined = truncated_lines.join("\n");
parent.write_abs(&s_combined, combined_pos);
} else {
for (i, line) in truncated_lines.iter().enumerate() {
print!(
"\x1B[{};{}H{outline_ch}",
self.pos.1 + i + 2,
self.pos.0 + self.get_size_root().0 + 2,
"\x1b[{};{}H{}",
self.pos.1 + pos.1 + i as u16,
self.pos.0 + pos.0,
line
);
}
}
@@ -455,7 +472,7 @@ impl Writer {
}
pub fn new_frame(&mut self) -> crate::utils::Frame {
crate::utils::Frame::new(self, unsafe { &*self.css })
crate::utils::Frame::new(self)
}
pub fn caret(&self) -> String {
src/main.rs
+9 -5
View File
@@ -6,10 +6,14 @@ fn main() {
#[component]
pub fn App() {
ersx! {
text { style: style! {
x: 30 px,
y: 4 px
}, "hello, world" }
rsx! {
text { style: style!{
outline: true,
}, "Hello, World!\nabc" }
text { style: style!{
outline: true,
width: 3 px
}, "Hello, World!\nabc testing" }
}
}
src/ui/styles.rs
+5 -1
View File
@@ -322,7 +322,11 @@ impl Number {
}
pub fn as_size(&self, written: u16, frame_size: u16, outline: bool) -> u16 {
if *self == Number::Auto {
written
if written > 0 {
written - 1
} else {
written
}
} else if outline {
self.as_size_raw(frame_size) - 2
} else {
src/utils.rs
+29 -17
View File
@@ -2,31 +2,27 @@ use std::io::{stdout, Write};
pub struct Frame<'a> {
used: Vec<u16>,
css: &'a crate::ui::Css,
writer: &'a mut crate::Writer,
}
impl<'a> Frame<'a> {
pub fn new(writer: &'a mut crate::Writer, css: &'a crate::ui::Css) -> Self {
pub fn new(writer: &'a mut crate::Writer) -> Self {
Frame {
used: vec![0; writer.size.1 as usize],
css,
writer,
}
}
pub fn render(&mut self, focused: bool, element: &crate::Element) {
let style = element.get_style();
let mut style_element = style.clone().get(focused);
let css = unsafe { &*self.writer.css };
for class in element.get_class().split(" ") {
if let Some(upper) = self
.css
.get(&crate::ui::StyleName::Class(class.to_string()))
{
if let Some(upper) = css.get(&crate::ui::StyleName::Class(class.to_string())) {
style_element.merge(upper);
}
if let Some(upper) = self.css.get(&crate::ui::StyleName::ClassState(
if let Some(upper) = css.get(&crate::ui::StyleName::ClassState(
class.to_string(),
if style.2 == "" && focused {
"hover".to_string()
@@ -56,24 +52,40 @@ impl<'a> Frame<'a> {
.x
.1
.as_position(style_element.outline.1, y_, self.writer.size.0);
let mut writer = crate::Writer::new(
let mut writer = crate::Writer {
focused,
style_element.clone(),
(x, y),
self.writer.size,
self.css,
);
style: style_element.clone(),
pos: (x, y),
size: self.writer.size,
css,
parent: Some(self.writer),
written: (0, 0),
};
element.render(&mut writer);
let (mut width, mut height) = writer.get_size_root();
if style_element.outline.1 {
width += 2;
height += 2;
}
for i in y..y + height {
if let Some(o) = self.used.get_mut(i as usize) {
*o += x + width;
{
let (mut x, mut y) = (x, y);
if style_element.outline.1 {
x -= 1;
y -= 1;
}
let height = if style_element.outline.1 {
height + 1
} else {
height
};
for i in y..y + height {
if let Some(o) = self.used.get_mut(i as usize) {
*o += x + width + 1;
}
}
}
writer.after_render(width, height);
}
}
}