diff options
| author | Christian Gmeiner <christian.gmeiner@gmail.com> | 2005-04-19 12:50:02 +0000 |
|---|---|---|
| committer | Christian Gmeiner <christian.gmeiner@gmail.com> | 2005-04-19 12:50:02 +0000 |
| commit | c3d0a229ccd859853641d7ee01e7c5c30045159c (patch) | |
| tree | 35c09b701ce7b0565d2bc11d0589b4061a15bdb6 | |
| parent | c6ec0f48a5999c4456439eb4e0b54467b464ed02 (diff) | |
| download | rockbox-c3d0a229ccd859853641d7ee01e7c5c30045159c.tar.gz rockbox-c3d0a229ccd859853641d7ee01e7c5c30045159c.zip | |
make use of font_getstringsize
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6322 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | firmware/drivers/lcd-recorder.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/firmware/drivers/lcd-recorder.c b/firmware/drivers/lcd-recorder.c index be46d0e367..ea28e5cc2f 100644 --- a/firmware/drivers/lcd-recorder.c +++ b/firmware/drivers/lcd-recorder.c | |||
| @@ -367,24 +367,7 @@ void lcd_setfont(int newfont) | |||
| 367 | 367 | ||
| 368 | int lcd_getstringsize(const unsigned char *str, int *w, int *h) | 368 | int lcd_getstringsize(const unsigned char *str, int *w, int *h) |
| 369 | { | 369 | { |
| 370 | struct font* pf = font_get(curfont); | 370 | return font_getstringsize(str, w, h, curfont); |
| 371 | int ch; | ||
| 372 | int width = 0; | ||
| 373 | |||
| 374 | while((ch = *str++)) { | ||
| 375 | /* check input range*/ | ||
| 376 | if (ch < pf->firstchar || ch >= pf->firstchar+pf->size) | ||
| 377 | ch = pf->defaultchar; | ||
| 378 | ch -= pf->firstchar; | ||
| 379 | |||
| 380 | /* get proportional width and glyph bits*/ | ||
| 381 | width += pf->width? pf->width[ch]: pf->maxwidth; | ||
| 382 | } | ||
| 383 | if ( w ) | ||
| 384 | *w = width; | ||
| 385 | if ( h ) | ||
| 386 | *h = pf->height; | ||
| 387 | return width; | ||
| 388 | } | 371 | } |
| 389 | 372 | ||
| 390 | /* put a string at a given char position */ | 373 | /* put a string at a given char position */ |