Garmelon/cove
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Extract constants to separate module

Browse source
This commit is contained in:
Joscha 2022-06-13 23:33:08 +02:00
parent 6e9216913e
commit eba68dc7d7
2 changed files with 31 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
cove-tui/src/chat/tree.rs
View file

@ -1,3 +1,5 @@
mod constants;
use std::collections::VecDeque; use std::collections::VecDeque;
use std::marker::PhantomData; use std::marker::PhantomData;
@ -8,11 +10,9 @@ use toss::frame::{Frame, Pos, Size};
use crate::store::{Msg, MsgStore, Tree}; use crate::store::{Msg, MsgStore, Tree};
use super::Cursor; use self::constants::{INDENT, INDENT_WIDTH, TIME_WIDTH};
const TIME_WIDTH: usize = 5; // hh:mm use super::Cursor;
const INDENT: &str = "| ";
const INDENT_WIDTH: usize = 2;
struct Block<I> { struct Block<I> {
line: i32, line: i32,
@ -187,7 +187,7 @@ impl<M: Msg> TreeView<M> {
let nick = msg.nick(); let nick = msg.nick();
let content = msg.content(); let content = msg.content();
let used_width = TIME_WIDTH + 1 + INDENT_WIDTH * indent + 1 + frame.width(&nick) + 2; let used_width = TIME_WIDTH + INDENT_WIDTH * indent + 1 + frame.width(&nick) + 2;
let rest_width = size.width as usize - used_width; let rest_width = size.width as usize - used_width;
let lines = toss::split_at_indices(&content, &frame.wrap(&content, rest_width)); let lines = toss::split_at_indices(&content, &frame.wrap(&content, rest_width));
@ -319,7 +319,7 @@ impl<M: Msg> TreeView<M> {
fn render_indentation(&mut self, frame: &mut Frame, pos: Pos, indent: usize, cursor: bool) { fn render_indentation(&mut self, frame: &mut Frame, pos: Pos, indent: usize, cursor: bool) {
for i in 0..indent { for i in 0..indent {
let x = TIME_WIDTH + 1 + INDENT_WIDTH * i; let x = TIME_WIDTH + INDENT_WIDTH * i;
let pos = Pos::new(pos.x + x as i32, pos.y); let pos = Pos::new(pos.x + x as i32, pos.y);
let style = if cursor { let style = if cursor {
ContentStyle::default().black().on_white() ContentStyle::default().black().on_white()
@ -348,7 +348,7 @@ impl<M: Msg> TreeView<M> {
block.cursor, block.cursor,
); );
let after_indent = let after_indent =
pos.x + (TIME_WIDTH + 1 + INDENT_WIDTH * block.indent) as i32; pos.x + (TIME_WIDTH + INDENT_WIDTH * block.indent) as i32;
if i == 0 { if i == 0 {
let time = format!("{}", msg.time.format("%H:%M")); let time = format!("{}", msg.time.format("%H:%M"));
frame.write(Pos::new(pos.x, y), &time, ContentStyle::default()); frame.write(Pos::new(pos.x, y), &time, ContentStyle::default());
@ -361,7 +361,7 @@ impl<M: Msg> TreeView<M> {
} }
BlockContent::Placeholder => { BlockContent::Placeholder => {
self.render_indentation(frame, pos, block.indent, block.cursor); self.render_indentation(frame, pos, block.indent, block.cursor);
let x = pos.x + (TIME_WIDTH + 1 + INDENT_WIDTH * block.indent) as i32; let x = pos.x + (TIME_WIDTH + INDENT_WIDTH * block.indent) as i32;
let y = pos.y + block.line; let y = pos.y + block.line;
frame.write(Pos::new(x, y), "[...]", ContentStyle::default()); frame.write(Pos::new(x, y), "[...]", ContentStyle::default());
} }

23
cove-tui/src/chat/tree/constants.rs Normal file
View file

@ -0,0 +1,23 @@
use crossterm::style::{ContentStyle, Stylize};
pub const TIME_FORMAT: &str = "%H:%M ";
pub const TIME_WIDTH: usize = 6;
pub fn style_time() -> ContentStyle {
ContentStyle::default().grey()
}
pub fn style_time_inverted() -> ContentStyle {
ContentStyle::default().black().on_white()
}
pub const INDENT: &str = "│ ";
pub const INDENT_WIDTH: usize = 2;
pub fn style_indent() -> ContentStyle {
ContentStyle::default().grey()
}
pub fn style_indent_inverted() -> ContentStyle {
ContentStyle::default().black().on_white()
}