devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Added quick-set screens to F2 (play modes) and F3 (screen settings) in dir browser and wps. Fixed minor propfont issues in lcd.c. Exported icons outside of icons.c

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2154 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Björn Stenberg 2002-09-03 15:58:47 +00:00
parent 27c7392777
commit abe11fd910
7 changed files with 227 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

10
firmware/drivers/lcd.c
View file

@ -797,7 +797,6 @@ extern unsigned char char_dw_8x8_prop[][9];
int lcd_getstringsize(unsigned char *str, unsigned int font, int *w, int *h)
{
int width=0;
int height=0;
unsigned char ch, byte;
(void)font;
@ -811,12 +810,9 @@ int lcd_getstringsize(unsigned char *str, unsigned int font, int *w, int *h)
byte = char_dw_8x8_prop[ch][8];
width += (byte>>4) + 1;
if((byte & 0x0f) > height)
height = byte & 0x0f;
}
*w = width;
*h = height;
*h = 8;
return width;
}
@ -851,7 +847,7 @@ void lcd_putspropxy(int x, int y, unsigned char *str, int thisfont)
break;
src = char_dw_8x8_prop[ch];
lcd_clearrect (lcd_x+nx, lcd_y, 1, ny);
lcd_clearrect (lcd_x+nx, lcd_y, 1, ny );
lcd_bitmap (src, lcd_x, lcd_y, nx, ny, true);
lcd_x += nx+1;
@ -928,7 +924,7 @@ void lcd_putsxy(int x, int y, unsigned char *str, int thisfont)
}
#endif
while (((ch = *str++) != '\0') && (lcd_x + nx < LCD_WIDTH))
while (((ch = *str++) != '\0') && (lcd_x + nx <= LCD_WIDTH))
{
if (lcd_y + ny > LCD_HEIGHT)
return;