added outlines
This commit is contained in:
@@ -5,7 +5,11 @@ pub mod counter_example {
|
|||||||
let count = State::new(0);
|
let count = State::new(0);
|
||||||
|
|
||||||
rsx! {
|
rsx! {
|
||||||
|
@SetStyle(styling())
|
||||||
|
|
||||||
button {
|
button {
|
||||||
|
class: "outline",
|
||||||
|
|
||||||
on_click: fn(_, _, _) @count {
|
on_click: fn(_, _, _) @count {
|
||||||
count += 1;
|
count += 1;
|
||||||
},
|
},
|
||||||
@@ -14,6 +18,15 @@ pub mod counter_example {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn styling() -> Css {
|
||||||
|
css! {
|
||||||
|
"outline" {
|
||||||
|
outline: true,
|
||||||
|
outline_color: Red
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub mod todo_example {
|
pub mod todo_example {
|
||||||
|
|||||||
+32
-1
@@ -333,19 +333,50 @@ impl Writer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn write(&mut self, s: &str) {
|
pub fn write(&mut self, s: &str) {
|
||||||
|
let outline_ch = self.style.write_outline("|");
|
||||||
for (i, line) in s.lines().enumerate() {
|
for (i, line) in s.lines().enumerate() {
|
||||||
|
if self.style.outline.1 {
|
||||||
|
print!(
|
||||||
|
"\x1B[{};{}H{outline_ch}{}{outline_ch}",
|
||||||
|
self.absolute.1 + 2 + i as u16,
|
||||||
|
self.absolute.0 + 1,
|
||||||
|
self.style.write(line)
|
||||||
|
);
|
||||||
|
} else {
|
||||||
print!(
|
print!(
|
||||||
"\x1B[{};{}H{}",
|
"\x1B[{};{}H{}",
|
||||||
self.absolute.1 + 1 + i as u16,
|
self.absolute.1 + 1 + i as u16,
|
||||||
self.absolute.0 + 1,
|
self.absolute.0 + 1,
|
||||||
self.style.write(line)
|
self.style.write(line)
|
||||||
);
|
);
|
||||||
|
}
|
||||||
let line_len = line.len() as u16;
|
let line_len = line.len() as u16;
|
||||||
if line_len > self.written.0 {
|
if line_len > self.written.0 {
|
||||||
self.written.0 = line_len;
|
self.written.0 = line_len;
|
||||||
}
|
}
|
||||||
self.written.1 += 1;
|
self.written.1 += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if self.style.outline.1 {
|
||||||
|
print!(
|
||||||
|
"\x1B[{};{}H{}",
|
||||||
|
self.absolute.1 + 1,
|
||||||
|
self.absolute.0 + 1,
|
||||||
|
self.style.write_outline(&format!(
|
||||||
|
"╭{}╮",
|
||||||
|
"─".repeat(self.get_size_root().0 as usize)
|
||||||
|
))
|
||||||
|
);
|
||||||
|
print!(
|
||||||
|
"\x1B[{};{}H{}",
|
||||||
|
self.absolute.1 + self.written.1 + 2,
|
||||||
|
self.absolute.0 + 1,
|
||||||
|
self.style.write_outline(&format!(
|
||||||
|
"╰{}╯",
|
||||||
|
"─".repeat(self.get_size_root().0 as usize)
|
||||||
|
))
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_focused(&self) -> bool {
|
pub fn get_focused(&self) -> bool {
|
||||||
@@ -378,7 +409,7 @@ impl Writer {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn new_frame(&self) -> crate::utils::Frame {
|
pub fn new_frame(&mut self) -> crate::utils::Frame {
|
||||||
crate::utils::Frame::new(self.absolute, self.get_size(), unsafe { &*self.css })
|
crate::utils::Frame::new(self.absolute, self.get_size(), unsafe { &*self.css })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-1
@@ -34,11 +34,12 @@ pub struct Div {
|
|||||||
|
|
||||||
impl ElementWidget for Div<'_> {
|
impl ElementWidget for Div<'_> {
|
||||||
fn render(&self, writer: &mut crate::Writer) {
|
fn render(&self, writer: &mut crate::Writer) {
|
||||||
|
let focused = writer.get_focused();
|
||||||
let mut frame = writer.new_frame();
|
let mut frame = writer.new_frame();
|
||||||
|
|
||||||
if let Children::Children(children, child) = &self.children {
|
if let Children::Children(children, child) = &self.children {
|
||||||
for (i, elem) in children.iter().enumerate() {
|
for (i, elem) in children.iter().enumerate() {
|
||||||
frame.render(writer.get_focused() && i == *child, elem);
|
frame.render(focused && i == *child, elem);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -137,6 +137,9 @@ impl StyleElement {
|
|||||||
.collect::<Vec<String>>()
|
.collect::<Vec<String>>()
|
||||||
.join("\n")
|
.join("\n")
|
||||||
}
|
}
|
||||||
|
pub fn write_outline(&self, outline: &str) -> String {
|
||||||
|
format!("{}{outline}\x1b[0m", self.outline_color.1.ansi(),)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for StyleElement {
|
impl Default for StyleElement {
|
||||||
|
|||||||
+8
-19
@@ -1,20 +1,18 @@
|
|||||||
use std::io::{stdout, Write};
|
use std::io::{stdout, Write};
|
||||||
|
|
||||||
use crossterm::terminal::disable_raw_mode;
|
|
||||||
|
|
||||||
use crate::ui;
|
use crate::ui;
|
||||||
|
|
||||||
pub struct Frame {
|
pub struct Frame<'a> {
|
||||||
used: Vec<u16>,
|
used: Vec<u16>,
|
||||||
width: u16,
|
width: u16,
|
||||||
height: u16,
|
height: u16,
|
||||||
x: u16,
|
x: u16,
|
||||||
y: u16,
|
y: u16,
|
||||||
css: *const ui::Css,
|
css: &'a ui::Css,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Frame {
|
impl<'a> Frame<'a> {
|
||||||
pub fn new((x, y): (u16, u16), (width, height): (u16, u16), css: &crate::ui::Css) -> Self {
|
pub fn new((x, y): (u16, u16), (width, height): (u16, u16), css: &'a crate::ui::Css) -> Self {
|
||||||
Frame {
|
Frame {
|
||||||
used: vec![0; height as usize],
|
used: vec![0; height as usize],
|
||||||
width,
|
width,
|
||||||
@@ -28,21 +26,18 @@ impl Frame {
|
|||||||
let style = element.get_style();
|
let style = element.get_style();
|
||||||
let mut style_element = style.clone().get(focused);
|
let mut style_element = style.clone().get(focused);
|
||||||
|
|
||||||
if let Some(upper) = unsafe { (*self.css).get(&ui::StyleName::Class(element.get_class())) }
|
if let Some(upper) = self.css.get(&ui::StyleName::Class(element.get_class())) {
|
||||||
{
|
|
||||||
style_element.merge(upper);
|
style_element.merge(upper);
|
||||||
}
|
}
|
||||||
|
|
||||||
if let Some(upper) = unsafe {
|
if let Some(upper) = self.css.get(&ui::StyleName::ClassState(
|
||||||
(*self.css).get(&ui::StyleName::ClassState(
|
|
||||||
element.get_class(),
|
element.get_class(),
|
||||||
if style.2 == "" && focused {
|
if style.2 == "" && focused {
|
||||||
"hover".to_string()
|
"hover".to_string()
|
||||||
} else {
|
} else {
|
||||||
style.2.clone()
|
style.2.clone()
|
||||||
},
|
},
|
||||||
))
|
)) {
|
||||||
} {
|
|
||||||
style_element.merge(upper);
|
style_element.merge(upper);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -64,16 +59,10 @@ impl Frame {
|
|||||||
style_element.clone(),
|
style_element.clone(),
|
||||||
(x + self.x, y + self.y),
|
(x + self.x, y + self.y),
|
||||||
(self.width, self.height),
|
(self.width, self.height),
|
||||||
unsafe { &*self.css },
|
self.css,
|
||||||
);
|
);
|
||||||
element.render(&mut writer);
|
element.render(&mut writer);
|
||||||
let (width, height) = writer.get_size_root();
|
let (width, height) = writer.get_size_root();
|
||||||
if style_element.outline.1 {
|
|
||||||
clear();
|
|
||||||
show_cursor();
|
|
||||||
disable_raw_mode().unwrap();
|
|
||||||
panic!("the 'outline' option isn't available right now. please set 'outline' to 'false'")
|
|
||||||
}
|
|
||||||
for i in y..y + height {
|
for i in y..y + height {
|
||||||
if let Some(o) = self.used.get_mut(i as usize) {
|
if let Some(o) = self.used.get_mut(i as usize) {
|
||||||
*o += x + width;
|
*o += x + width;
|
||||||
|
|||||||
Reference in New Issue
Block a user