diff options
| author | Marcoen Hirschberg <marcoen@gmail.com> | 2005-12-06 13:27:15 +0000 |
|---|---|---|
| committer | Marcoen Hirschberg <marcoen@gmail.com> | 2005-12-06 13:27:15 +0000 |
| commit | b0fee17d6e1a463dcd84568e5997663b69488998 (patch) | |
| tree | fffce775c4d1636a8bbc9e97669aa99b9378fc15 /apps/gui | |
| parent | 01917ec9809f1abff87cb372b700fc09476d343e (diff) | |
| download | rockbox-b0fee17d6e1a463dcd84568e5997663b69488998.zip rockbox-b0fee17d6e1a463dcd84568e5997663b69488998.tar.gz rockbox-b0fee17d6e1a463dcd84568e5997663b69488998.tar.bz2 rockbox-b0fee17d6e1a463dcd84568e5997663b69488998.tar.xz | |
waiting is over: initial unicode commit
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8169 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
| -rw-r--r-- | apps/gui/buttonbar.c | 6 | ||||
| -rw-r--r-- | apps/gui/quickscreen.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/gui/buttonbar.c b/apps/gui/buttonbar.c index 0917c51..b0c374d 100644 --- a/apps/gui/buttonbar.c +++ b/apps/gui/buttonbar.c @@ -47,9 +47,9 @@ void gui_buttonbar_set_display(struct gui_buttonbar * buttonbar, void gui_buttonbar_draw_button(struct gui_buttonbar * buttonbar, int num) { int xpos, ypos, button_width, text_width; - int fw, fh; + int fh; struct screen * display = buttonbar->display; - display->getstringsize("M", &fw, &fh); + display->getstringsize("M", NULL, &fh); button_width = display->width/BUTTONBAR_MAX_BUTTONS; xpos = num * button_width; @@ -58,7 +58,7 @@ void gui_buttonbar_draw_button(struct gui_buttonbar * buttonbar, int num) if(buttonbar->caption[num][0] != 0) { /* center the text */ - text_width = fw * strlen(buttonbar->caption[num]); + text_width = display->getstringsize(buttonbar->caption[num], NULL, NULL); display->putsxy(xpos + (button_width - text_width)/2, ypos, buttonbar->caption[num]); } diff --git a/apps/gui/quickscreen.c b/apps/gui/quickscreen.c index 8c23de9..07d4e2e 100644 --- a/apps/gui/quickscreen.c +++ b/apps/gui/quickscreen.c @@ -52,7 +52,7 @@ void gui_quickscreen_draw(struct gui_quickscreen * qs, struct screen * display) #endif gui_textarea_clear(display); display->setfont(FONT_SYSFIXED); - display->getstringsize((unsigned char *)"M",&w,&h); + display->getstringsize((unsigned char *)"M", NULL, &h); /* Displays the icons */ display->mono_bitmap(bitmap_icons_7x8[Icon_FastBackward], display->width/2 - 16, |