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

Fixed truncated option strings for numeric settings.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8043 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2005-11-22 11:31:28 +00:00
parent be15957c24
commit fd02642ee0
4 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
apps/gui/option_select.c
View file

@ -90,13 +90,14 @@ void option_select_prev(struct option_select * opt)
opt->option-=opt->step; opt->option-=opt->step;
} }
const char * option_select_get_text(struct option_select * opt, char * buffer) const char * option_select_get_text(struct option_select * opt, char * buffer,
int buffersize)
{ {
if(opt->items) if(opt->items)
return(P2STR(opt->items[opt->option].string)); return(P2STR(opt->items[opt->option].string));
if(!opt->formatter) if(!opt->formatter)
snprintf(buffer, sizeof buffer,"%d %s", opt->option, opt->extra_string); snprintf(buffer, buffersize,"%d %s", opt->option, opt->extra_string);
else else
opt->formatter(buffer, sizeof buffer, opt->option, opt->extra_string); opt->formatter(buffer, buffersize, opt->option, opt->extra_string);
return(buffer); return(buffer);
} }

4
apps/gui/option_select.h
View file

@ -77,7 +77,9 @@ extern void option_select_init_items(struct option_select * opt,
* - buffer : a buffer to eventually format the option * - buffer : a buffer to eventually format the option
* Returns the selected option * Returns the selected option
*/ */
extern const char * option_select_get_text(struct option_select * opt, char * buffer); extern const char * option_select_get_text(struct option_select * opt,
char * buffer,
int buffersize);
/* /*
* Selects the next value * Selects the next value

6
apps/gui/quickscreen.c
View file

@ -66,14 +66,14 @@ void gui_quickscreen_draw(struct gui_quickscreen * qs, struct screen * display)
/* Displays the left's text */ /* Displays the left's text */
title=option_select_get_title(qs->left_option); title=option_select_get_title(qs->left_option);
option=option_select_get_text(qs->left_option, buffer); option=option_select_get_text(qs->left_option, buffer, sizeof buffer);
display->putsxy(0, display->height/2 - h*2, title); display->putsxy(0, display->height/2 - h*2, title);
display->putsxy(0, display->height/2 - h, qs->left_right_title); display->putsxy(0, display->height/2 - h, qs->left_right_title);
display->putsxy(0, display->height/2, option); display->putsxy(0, display->height/2, option);
/* Displays the bottom's text */ /* Displays the bottom's text */
title=option_select_get_title(qs->bottom_option); title=option_select_get_title(qs->bottom_option);
option=option_select_get_text(qs->bottom_option, buffer); option=option_select_get_text(qs->bottom_option, buffer, sizeof buffer);
display->getstringsize(title, &w, &h); display->getstringsize(title, &w, &h);
display->putsxy((display->width-w)/2, display->height - h*2, title); display->putsxy((display->width-w)/2, display->height - h*2, title);
display->getstringsize(option, &w, &h); display->getstringsize(option, &w, &h);
@ -81,7 +81,7 @@ void gui_quickscreen_draw(struct gui_quickscreen * qs, struct screen * display)
/* Displays the right's text */ /* Displays the right's text */
title=option_select_get_title(qs->right_option); title=option_select_get_title(qs->right_option);
option=option_select_get_text(qs->right_option, buffer); option=option_select_get_text(qs->right_option, buffer, sizeof buffer);
display->getstringsize(title,&w,&h); display->getstringsize(title,&w,&h);
display->putsxy(display->width - w, display->height/2 - h*2, title); display->putsxy(display->width - w, display->height/2 - h*2, title);
display->getstringsize(qs->left_right_title,&w,&h); display->getstringsize(qs->left_right_title,&w,&h);

3
apps/gui/select.c
View file

@ -54,7 +54,8 @@ void gui_select_init_items(struct gui_select * select,
void gui_select_draw(struct gui_select * select, struct screen * display) void gui_select_draw(struct gui_select * select, struct screen * display)
{ {
char buffer[30]; char buffer[30];
const char * selected=option_select_get_text(&(select->options), buffer); const char * selected=option_select_get_text(&(select->options), buffer,
sizeof buffer);
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
screen_set_xmargin(display, 0); screen_set_xmargin(display, 0);
#endif #endif