From 7aa192047b8c0d47b9f67840ebde7d7f79a271bb Mon Sep 17 00:00:00 2001 From: Joscha Date: Sat, 9 Mar 2024 19:02:39 +0100 Subject: [PATCH] Add box around /me --- showbits-thermal-printer/src/drawer.rs | 41 +++++++++++++++++++------- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/showbits-thermal-printer/src/drawer.rs b/showbits-thermal-printer/src/drawer.rs index d696681..644ccd6 100644 --- a/showbits-thermal-printer/src/drawer.rs +++ b/showbits-thermal-printer/src/drawer.rs @@ -140,28 +140,47 @@ impl Drawer { .node() .with_border_all(length(1.0)) .with_padding_horiz(length(1.0)) + .with_margin_right(length(4.0)) .with_flex_shrink(0.0) // Avoid wrapping .and_child(username) .register(&mut tree)?; - 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)?; + let content = if let Some(content) = content.strip_prefix("/me") { + let content = content.trim_start(); - let content = Node::empty() - .with_padding_vert(length(1.0)) - .and_child(content) - .register(&mut tree)?; + 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_vert(length(1.0)) .with_flex_direction(FlexDirection::Row) .with_align_items(Some(AlignItems::Start)) - .with_gap_width(length(4.0)) .and_child(username) .and_child(content) .register(&mut tree)?;