Minor tweaks to font size of title/artist

This commit is contained in:
Stephen Seo 2021-10-11 18:53:28 +09:00
parent a2e75d1583
commit 115c81583e

View file

@ -21,6 +21,7 @@ const TIME_MAX_DIFF: f64 = 2.0f64;
const INITIAL_FONT_SIZE: u16 = 96; const INITIAL_FONT_SIZE: u16 = 96;
const TITLE_INITIAL_FONT_SIZE: u16 = 196; const TITLE_INITIAL_FONT_SIZE: u16 = 196;
const TITLE_INITIAL_MIN_FONT_SIZE: u16 = 44; const TITLE_INITIAL_MIN_FONT_SIZE: u16 = 44;
const TITLE_SCREEN_FACTOR: u16 = 800;
const ARTIST_INITIAL_FONT_SIZE: u16 = 48; const ARTIST_INITIAL_FONT_SIZE: u16 = 48;
const TIMER_FONT_SIZE: u16 = 64; const TIMER_FONT_SIZE: u16 = 64;
const SCREEN_DIFF_MARGIN: f32 = 1.0; const SCREEN_DIFF_MARGIN: f32 = 1.0;
@ -887,11 +888,12 @@ async fn main() -> Result<(), String> {
// Get title dimensions early so that artist size is at most title size // Get title dimensions early so that artist size is at most title size
if !title.is_empty() && !opt.disable_show_title && title_dim_opt.is_none() { if !title.is_empty() && !opt.disable_show_title && title_dim_opt.is_none() {
let mut length: u16 = title.chars().count().try_into().unwrap_or(u16::MAX); let mut length: u16 = title.chars().count().try_into().unwrap_or(u16::MAX);
length /= 8; length /= 10;
if length <= 2 { if length <= 2 {
length = 3; length = 3;
} }
title_font_size = TITLE_INITIAL_FONT_SIZE / length as u16; let screen_factor = 4 * screen_width() as u16 / TITLE_SCREEN_FACTOR;
title_font_size = TITLE_INITIAL_FONT_SIZE / length as u16 + screen_factor;
if title_font_size < TITLE_INITIAL_MIN_FONT_SIZE { if title_font_size < TITLE_INITIAL_MIN_FONT_SIZE {
title_font_size = TITLE_INITIAL_MIN_FONT_SIZE; title_font_size = TITLE_INITIAL_MIN_FONT_SIZE;
} }