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

Turn ChatMessage into drawing

Browse source
This commit is contained in:
Joscha 2024-03-30 12:52:39 +01:00
parent 13ee9c5267
commit 57fc128be0
3 changed files with 101 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

107
showbits-thermal-printer/src/drawer.rs
View file

@ -1,25 +1,18 @@
mod calendar;
mod cells;
mod chat_message;
mod image;
mod photo;
mod text;
use showbits_common::{
color::{BLACK, WHITE},
widgets::{Block, FontStuff, HasFontStuff, Text},
Node, Tree, WidgetExt,
};
use taffy::{
style_helpers::{length, percent},
AlignItems, FlexDirection,
};
use showbits_common::widgets::{FontStuff, HasFontStuff};
use tokio::sync::mpsc;
use crate::printer::Printer;
pub use self::{
calendar::CalendarDrawing, cells::CellsDrawing, image::ImageDrawing, photo::PhotoDrawing,
text::TextDrawing,
calendar::CalendarDrawing, cells::CellsDrawing, chat_message::ChatMessageDrawing,
image::ImageDrawing, photo::PhotoDrawing, text::TextDrawing,
};
#[derive(Default)]
@ -31,17 +24,11 @@ pub trait Drawing {
fn draw(&self, printer: &mut Printer, ctx: &mut Context) -> anyhow::Result<()>;
}
pub struct BoxedDrawing(Box<dyn Drawing + Send>);
pub enum Command {
Draw(BoxedDrawing),
ChatMessage { username: String, content: String },
}
pub struct Command(Box<dyn Drawing + Send>);
impl Command {
pub fn draw<D: Drawing + Send + 'static>(drawing: D) -> Self {
Self::Draw(BoxedDrawing(Box::new(drawing)))
Self(Box::new(drawing))
}
}
@ -68,88 +55,8 @@ impl Drawer {
pub fn run(&mut self) -> anyhow::Result<()> {
while let Some(command) = self.rx.blocking_recv() {
self.on_command(command)?;
command.0.draw(&mut self.printer, &mut self.ctx)?;
}
Ok(())
}
fn on_command(&mut self, command: Command) -> anyhow::Result<()> {
match command {
Command::Draw(drawing) => drawing.0.draw(&mut self.printer, &mut self.ctx)?,
Command::ChatMessage { username, content } => {
self.on_chat_message(username, content)?
}
}
Ok(())
}
fn on_chat_message(&mut self, username: String, content: String) -> anyhow::Result<()> {
let mut tree = Tree::<Context>::new(WHITE);
let max_username_width_in_chars = 32.0;
let max_username_height_in_lines = 3.0;
let max_content_height_in_lines = 16.0;
let username = Text::new()
.and_plain(username)
.widget(&mut self.ctx.font_stuff)
.node()
.with_max_size_width(length(max_username_width_in_chars * 8.0))
.with_max_size_height(length(max_username_height_in_lines * 16.0))
.register(&mut tree)?;
let username = Block::new()
.with_border(BLACK)
.node()
.with_border_all(length(1.0))
.with_padding_horiz(length(1.0))
.with_flex_shrink(0.0) // Avoid wrapping
.and_child(username)
.register(&mut tree)?;
let content = if let Some(content) = content.strip_prefix("/me") {
let content = content.trim_start();
let content = Text::new()
.and_plain(content)
.widget(&mut self.ctx.font_stuff)
.node()
.with_max_size_height(length(max_content_height_in_lines * 16.0))
.register(&mut tree)?;
Block::new()
.with_border(BLACK)
.node()
.with_border_all(length(1.0))
.with_padding_horiz(length(1.0))
.and_child(content)
.register(&mut tree)?
} else {
let content = Text::new()
.and_plain(content)
.widget(&mut self.ctx.font_stuff)
.node()
.with_max_size_height(length(max_content_height_in_lines * 16.0))
.register(&mut tree)?;
Node::empty()
.with_padding_vert(length(1.0))
.and_child(content)
.register(&mut tree)?
};
let root = Node::empty()
.with_size_width(percent(1.0))
.with_padding_all(length(1.0))
.with_flex_direction(FlexDirection::Row)
.with_align_items(Some(AlignItems::Start))
.with_gap_width(length(2.0))
.and_child(username)
.and_child(content)
.register(&mut tree)?;
self.printer.print_tree(&mut tree, &mut self.ctx, root)?;
Ok(())
}
}