From ea8deec51c13f9193dd2ccf7fcb0aeb938b921d3 Mon Sep 17 00:00:00 2001 From: Björn Stenberg Date: Wed, 28 Aug 2002 10:41:49 +0000 Subject: Repearied LOADABLE_FONTS, which was broken by the recent propfonts scroll fix git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2025 a1c6a512-1295-4272-9138-f99709370657 --- firmware/drivers/lcd.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'firmware/drivers/lcd.c') diff --git a/firmware/drivers/lcd.c b/firmware/drivers/lcd.c index 4d805b2506..1984f66617 100644 --- a/firmware/drivers/lcd.c +++ b/firmware/drivers/lcd.c @@ -1284,10 +1284,14 @@ void lcd_puts_scroll(int x, int y, unsigned char* string ) s->textlen = strlen(string); -#if defined(LCD_PROPFONTS) || defined(LOADABLE_FONTS) +#if defined(LCD_PROPFONTS) s->space += 2; lcd_getstringsize(string,0,&w,&h); if ( w > LCD_WIDTH - xmargin ) { +#elif defined(LOADABLE_FONTS) + s->space += 2; + lcd_getstringsize(string,_font,&w,&h); + if ( w > LCD_WIDTH - xmargin ) { #else if ( s->textlen > s->space ) { #endif -- cgit v1.2.3