From bed3d3f7e06c6582f9677ab6222cd89c84a9c8c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Stenberg?= Date: Fri, 20 Sep 2002 08:07:51 +0000 Subject: New full ISO-8859-1 system font. Added font loading from dir browser. Changed default font location to /.rockbox/default.fnt. Code-policed font code. Removed old font tools. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2347 a1c6a512-1295-4272-9138-f99709370657 --- apps/recorder/icons.c | 10 ++++++---- apps/recorder/icons.h | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'apps/recorder') diff --git a/apps/recorder/icons.c b/apps/recorder/icons.c index fbfaf6cd8c..0e628d8255 100644 --- a/apps/recorder/icons.c +++ b/apps/recorder/icons.c @@ -69,6 +69,8 @@ unsigned char bitmap_icons_6x8[LastIcon][6] = { 0x58, 0x5f, 0x42, 0x50, 0x55, 0x00 }, /* Mod or ajz file */ { 0x63, 0x7f, 0x3a, 0x7f, 0x63, 0x00 }, + /* Font file */ + { 0x60, 0x70, 0x38, 0x2c, 0x7e, 0x7e }, }; unsigned char bitmap_icons_7x8[][7] = @@ -234,10 +236,10 @@ void statusbar_icon_volume(int percent) /* display volume lever numerical? */ if (TIME_BEFORE(current_tick,switch_tick)) { snprintf(buffer, sizeof(buffer), "%2d", percent); - lcd_getstringsize(buffer, FONT_UI, &width, &height); + lcd_getstringsize(buffer, FONT_SYSFIXED, &width, &height); if (height <= STATUSBAR_HEIGHT) lcd_putsxy(ICON_VOLUME_X_POS + ICON_VOLUME_WIDTH / 2 - - width/2, STATUSBAR_Y_POS, buffer, 0); + width/2, STATUSBAR_Y_POS, buffer, FONT_SYSFIXED); } else { /* display volume bar */ volume = volume * 14 / 100; @@ -309,8 +311,8 @@ void statusbar_time(int hour, int minute) strncpy(buffer, "--:--", sizeof buffer); } - lcd_getstringsize(buffer, FONT_UI, &width, &height); + lcd_getstringsize(buffer, FONT_SYSFIXED, &width, &height); if (height <= STATUSBAR_HEIGHT) - lcd_putsxy(TIME_X_END - width, STATUSBAR_Y_POS, buffer, 0); + lcd_putsxy(TIME_X_END - width, STATUSBAR_Y_POS, buffer, FONT_SYSFIXED); } #endif diff --git a/apps/recorder/icons.h b/apps/recorder/icons.h index 3102093898..1cf75151da 100644 --- a/apps/recorder/icons.h +++ b/apps/recorder/icons.h @@ -28,6 +28,7 @@ enum icons_6x8 { Box_Filled, Box_Empty, Slider_Horizontal, File, Folder, Directory, Playlist, Repeat, Selected, Cursor, Wps, Mod_Ajz, + Font, LastIcon }; -- cgit v1.2.3