Skip to content

Commit

Permalink
Trim greeting if it doesn't fit on screen
Browse files Browse the repository at this point in the history
  • Loading branch information
zargony committed Nov 9, 2024
1 parent 6526122 commit 9382d1c
Showing 1 changed file with 11 additions and 6 deletions.
17 changes: 11 additions & 6 deletions firmware/src/screen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ const HCENTER: i32 = WIDTH / 2;
/// Screen height
const HEIGHT: i32 = 64;

/// Number of characters that fit in a line
const MEDIUM_CHARS_PER_LINE: i32 = WIDTH / 6;

/// Screen display error
pub type Error<E> = u8g2_fonts::Error<E>;

Expand Down Expand Up @@ -220,14 +223,16 @@ impl<'a> Screen for NumberOfDrinks<'a> {
"Hi", "Hallo", "Hey", "Tach", "Servus", "Moin", "Hej", "Olá", "Ciao",
];

// Trim name if it's too long to display
let greeting = GREETINGS[self.greeting as usize % GREETINGS.len()];
let greeting_len = greeting.len() + 1;
let name = if self.name.len() + greeting_len > MEDIUM_CHARS_PER_LINE as usize {
&self.name[..(MEDIUM_CHARS_PER_LINE as usize - greeting_len)]
} else {
self.name
};

centered(
&MEDIUM_FONT,
8,
format_args!("{greeting} {}", self.name),
target,
)?;
centered(&MEDIUM_FONT, 8, format_args!("{greeting} {name}"), target)?;
centered(&TITLE_FONT, 8 + 22, "Anzahl Getränke\nwählen", target)?;
footer("* Abbruch", "1-9 Weiter", target)?;
Ok(())
Expand Down

0 comments on commit 9382d1c

Please sign in to comment.