From abe11fd910f979f95454e3b44aba5a57570c6543 Mon Sep 17 00:00:00 2001 From: Björn Stenberg Date: Tue, 3 Sep 2002 15:58:47 +0000 Subject: 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 git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2154 a1c6a512-1295-4272-9138-f99709370657 --- firmware/drivers/lcd.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'firmware/drivers/lcd.c') diff --git a/firmware/drivers/lcd.c b/firmware/drivers/lcd.c index 03f667acfa..0fa077c7ba 100644 --- a/firmware/drivers/lcd.c +++ b/firmware/drivers/lcd.c @@ -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; -- cgit v1.2.3