diff options
| author | Björn Stenberg <bjorn@haxx.se> | 2002-08-28 10:41:49 +0000 |
|---|---|---|
| committer | Björn Stenberg <bjorn@haxx.se> | 2002-08-28 10:41:49 +0000 |
| commit | ea8deec51c13f9193dd2ccf7fcb0aeb938b921d3 (patch) | |
| tree | 6b0168e495536b71c44593f59cc5778f2f05485b | |
| parent | ccfef0480b4e99e910703867e70d6c8a5a00389f (diff) | |
| download | rockbox-ea8deec51c13f9193dd2ccf7fcb0aeb938b921d3.zip rockbox-ea8deec51c13f9193dd2ccf7fcb0aeb938b921d3.tar.gz rockbox-ea8deec51c13f9193dd2ccf7fcb0aeb938b921d3.tar.bz2 rockbox-ea8deec51c13f9193dd2ccf7fcb0aeb938b921d3.tar.xz | |
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
| -rw-r--r-- | firmware/drivers/lcd.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/firmware/drivers/lcd.c b/firmware/drivers/lcd.c index 4d805b2..1984f66 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 |