forked from len0rd/rockbox
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
This commit is contained in:
parent
ccfef0480b
commit
ea8deec51c
1 changed files with 5 additions and 1 deletions
|
|
@ -1284,10 +1284,14 @@ void lcd_puts_scroll(int x, int y, unsigned char* string )
|
||||||
s->textlen = strlen(string);
|
s->textlen = strlen(string);
|
||||||
|
|
||||||
|
|
||||||
#if defined(LCD_PROPFONTS) || defined(LOADABLE_FONTS)
|
#if defined(LCD_PROPFONTS)
|
||||||
s->space += 2;
|
s->space += 2;
|
||||||
lcd_getstringsize(string,0,&w,&h);
|
lcd_getstringsize(string,0,&w,&h);
|
||||||
if ( w > LCD_WIDTH - xmargin ) {
|
if ( w > LCD_WIDTH - xmargin ) {
|
||||||
|
#elif defined(LOADABLE_FONTS)
|
||||||
|
s->space += 2;
|
||||||
|
lcd_getstringsize(string,_font,&w,&h);
|
||||||
|
if ( w > LCD_WIDTH - xmargin ) {
|
||||||
#else
|
#else
|
||||||
if ( s->textlen > s->space ) {
|
if ( s->textlen > s->space ) {
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue