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

Complete r22917. The icon still overlapped the text slightly.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22982 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Teruaki Kawashima 2009-10-06 13:17:58 +00:00
parent d996804600
commit 145c679c7d
1 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
apps/recorder/keyboard.c
View file

@ -408,7 +408,6 @@ int kbd_input(char* text, int buflen)
pm->curfont = FONT_SYSFIXED; pm->curfont = FONT_SYSFIXED;
} }
sc->setfont(pm->curfont);
/* find max width of keyboard glyphs. /* find max width of keyboard glyphs.
* since we're going to be adding spaces, * since we're going to be adding spaces,
* max width is at least their width */ * max width is at least their width */
@ -482,7 +481,7 @@ int kbd_input(char* text, int buflen)
{ {
struct keyboard_parameters *pm = &param[l]; struct keyboard_parameters *pm = &param[l];
struct screen *sc = &screens[l]; struct screen *sc = &screens[l];
int icon_w; int icon_w, sc_w, sc_h;
pm->text_w = pm->font_w; pm->text_w = pm->font_w;
@ -497,10 +496,11 @@ int kbd_input(char* text, int buflen)
} }
icon_w = get_icon_width(l); icon_w = get_icon_width(l);
pm->max_chars_text = (sc->getwidth() - icon_w * 2) sc_w = sc->getwidth();
/ pm->text_w; sc_h = sc->getheight();
pm->max_chars_text = (sc_w - icon_w * 2 - 2) / pm->text_w;
if(pm->max_chars_text < 3 && icon_w > pm->text_w) if(pm->max_chars_text < 3 && icon_w > pm->text_w)
pm->max_chars_text = sc->getwidth() / pm->text_w - 2; pm->max_chars_text = sc_w / pm->text_w - 2;
if (!kbd_loaded) if (!kbd_loaded)
{ {
@ -509,10 +509,10 @@ int kbd_input(char* text, int buflen)
} }
else else
{ {
pm->lines = (sc->getheight() - BUTTONBAR_HEIGHT - statusbar_size) pm->lines = (sc_h - BUTTONBAR_HEIGHT - statusbar_size)
/ pm->font_h - 1; / pm->font_h - 1;
pm->keyboard_margin = sc->getheight() - BUTTONBAR_HEIGHT - pm->keyboard_margin = sc_h - BUTTONBAR_HEIGHT - statusbar_size
statusbar_size - (pm->lines+1)*pm->font_h; - (pm->lines+1)*pm->font_h;
if (pm->keyboard_margin < 3) if (pm->keyboard_margin < 3)
{ {
@ -537,7 +537,7 @@ int kbd_input(char* text, int buflen)
#ifdef KBD_MORSE_INPUT #ifdef KBD_MORSE_INPUT
pm->old_main_y = pm->main_y; pm->old_main_y = pm->main_y;
if (morse_mode) if (morse_mode)
pm->main_y = sc->getheight() - pm->font_h; pm->main_y = sc_h - pm->font_h;
#endif #endif
} }
@ -729,8 +729,7 @@ int kbd_input(char* text, int buflen)
sc->vline(i, pm->main_y, pm->main_y + pm->font_h - 1); sc->vline(i, pm->main_y, pm->main_y + pm->font_h - 1);
if (pm->hangul) /* draw underbar */ if (pm->hangul) /* draw underbar */
sc->hline(pm->curpos*text_w, (pm->curpos+1)*text_w, sc->hline(i - text_w, i, pm->main_y + pm->font_h - 1);
pm->main_y + pm->font_h - 1);
} }
cur_blink = !cur_blink; cur_blink = !cur_blink;