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

Quickscreen: add more check for case that qs item is not set.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24901 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Teruaki Kawashima 2010-02-25 06:01:53 +00:00
parent 3849569afc
commit 51bc09e88e
1 changed files with 25 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

44
apps/gui/quickscreen.c
View file

@ -56,7 +56,7 @@ static void quickscreen_fix_viewports(struct gui_quickscreen *qs,
struct viewport *vp_icons) struct viewport *vp_icons)
{ {
int char_height, width, pad = 0; int char_height, width, pad = 0;
int left_width, right_width, vert_lines; int left_width = 0, right_width = 0, vert_lines;
unsigned char *s; unsigned char *s;
int nb_lines = viewport_get_nb_lines(parent); int nb_lines = viewport_get_nb_lines(parent);
@ -65,7 +65,7 @@ static void quickscreen_fix_viewports(struct gui_quickscreen *qs,
*/ */
if (nb_lines == 0) if (nb_lines == 0)
nb_lines++; nb_lines++;
char_height = parent->height/nb_lines; char_height = parent->height/nb_lines;
/* center the icons VP first */ /* center the icons VP first */
@ -74,7 +74,6 @@ static void quickscreen_fix_viewports(struct gui_quickscreen *qs,
vp_icons->x = parent->x; vp_icons->x = parent->x;
vp_icons->x += (parent->width-CENTER_ICONAREA_SIZE)/2; vp_icons->x += (parent->width-CENTER_ICONAREA_SIZE)/2;
vps[QUICKSCREEN_BOTTOM] = *parent; vps[QUICKSCREEN_BOTTOM] = *parent;
vps[QUICKSCREEN_TOP] = *parent; vps[QUICKSCREEN_TOP] = *parent;
/* depending on the space the top/buttom items use 1 or 2 lines */ /* depending on the space the top/buttom items use 1 or 2 lines */
@ -97,14 +96,19 @@ static void quickscreen_fix_viewports(struct gui_quickscreen *qs,
vp_icons->y = vps[QUICKSCREEN_TOP].y vp_icons->y = vps[QUICKSCREEN_TOP].y
+ vps[QUICKSCREEN_TOP].height; + vps[QUICKSCREEN_TOP].height;
vp_icons->height = parent->height - vp_icons->y; vp_icons->height = vps[QUICKSCREEN_BOTTOM].y - vp_icons->y;
vp_icons->height -= parent->height - vps[QUICKSCREEN_BOTTOM].y;
/* adjust the left/right items widths to fit the screen nicely */ /* adjust the left/right items widths to fit the screen nicely */
s = P2STR(ID2P(qs->items[QUICKSCREEN_LEFT]->lang_id)); if (qs->items[QUICKSCREEN_LEFT])
left_width = display->getstringsize(s, NULL, NULL); {
s = P2STR(ID2P(qs->items[QUICKSCREEN_RIGHT]->lang_id)); s = P2STR(ID2P(qs->items[QUICKSCREEN_LEFT]->lang_id));
right_width = display->getstringsize(s, NULL, NULL); left_width = display->getstringsize(s, NULL, NULL);
}
if (qs->items[QUICKSCREEN_RIGHT])
{
s = P2STR(ID2P(qs->items[QUICKSCREEN_RIGHT]->lang_id));
right_width = display->getstringsize(s, NULL, NULL);
}
width = MAX(left_width, right_width); width = MAX(left_width, right_width);
if (width*2 + vp_icons->width > parent->width) if (width*2 + vp_icons->width > parent->width)
@ -126,7 +130,7 @@ static void quickscreen_fix_viewports(struct gui_quickscreen *qs,
vps[QUICKSCREEN_LEFT] = *parent; vps[QUICKSCREEN_LEFT] = *parent;
vps[QUICKSCREEN_LEFT].x = parent->x + pad; vps[QUICKSCREEN_LEFT].x = parent->x + pad;
vps[QUICKSCREEN_LEFT].width = width; vps[QUICKSCREEN_LEFT].width = width;
vps[QUICKSCREEN_RIGHT] = *parent; vps[QUICKSCREEN_RIGHT] = *parent;
vps[QUICKSCREEN_RIGHT].x = parent->x + parent->width - width - pad; vps[QUICKSCREEN_RIGHT].x = parent->x + parent->width - width - pad;
vps[QUICKSCREEN_RIGHT].width = width; vps[QUICKSCREEN_RIGHT].width = width;
@ -270,6 +274,9 @@ static bool gui_quickscreen_do_button(struct gui_quickscreen * qs, int button)
default: default:
return false; return false;
} }
if (qs->items[item] == NULL)
return false;
option_select_next_val(qs->items[item], invert, true); option_select_next_val(qs->items[item], invert, true);
talk_qs_option(qs->items[item], false); talk_qs_option(qs->items[item], false);
return true; return true;
@ -292,7 +299,7 @@ static int quickscreen_touchscreen_button(const struct viewport
else if (viewport_point_within_vp(&vps[QUICKSCREEN_RIGHT], x, y)) else if (viewport_point_within_vp(&vps[QUICKSCREEN_RIGHT], x, y))
return ACTION_QS_RIGHT; return ACTION_QS_RIGHT;
return ACTION_STD_CANCEL; return ACTION_STD_CANCEL;
} }
#endif #endif
static bool gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_enter) static bool gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_enter)
@ -343,10 +350,10 @@ static bool gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_ente
} }
else if (button == button_enter) else if (button == button_enter)
can_quit = true; can_quit = true;
if ((button == button_enter) && can_quit) if ((button == button_enter) && can_quit)
break; break;
if (button == ACTION_STD_CANCEL) if (button == ACTION_STD_CANCEL)
break; break;
} }
@ -357,7 +364,7 @@ static bool gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_ente
for (j = 0; j < QUICKSCREEN_ITEM_COUNT; j++) for (j = 0; j < QUICKSCREEN_ITEM_COUNT; j++)
screens[i].scroll_stop(&vps[i][j]); screens[i].scroll_stop(&vps[i][j]);
} }
return changed; return changed;
} }
@ -376,16 +383,16 @@ bool quick_screen_quick(int button_enter)
bool oldshuffle = global_settings.playlist_shuffle; bool oldshuffle = global_settings.playlist_shuffle;
int oldrepeat = global_settings.repeat_mode; int oldrepeat = global_settings.repeat_mode;
qs.items[QUICKSCREEN_TOP] = qs.items[QUICKSCREEN_TOP] =
get_setting(global_settings.qs_items[QUICKSCREEN_TOP], get_setting(global_settings.qs_items[QUICKSCREEN_TOP],
find_setting(&global_settings.party_mode, NULL)); find_setting(&global_settings.party_mode, NULL));
qs.items[QUICKSCREEN_LEFT] = qs.items[QUICKSCREEN_LEFT] =
get_setting(global_settings.qs_items[QUICKSCREEN_LEFT], get_setting(global_settings.qs_items[QUICKSCREEN_LEFT],
find_setting(&global_settings.playlist_shuffle, NULL)); find_setting(&global_settings.playlist_shuffle, NULL));
qs.items[QUICKSCREEN_RIGHT] = qs.items[QUICKSCREEN_RIGHT] =
get_setting(global_settings.qs_items[QUICKSCREEN_RIGHT], get_setting(global_settings.qs_items[QUICKSCREEN_RIGHT],
find_setting(&global_settings.repeat_mode, NULL)); find_setting(&global_settings.repeat_mode, NULL));
qs.items[QUICKSCREEN_BOTTOM] = qs.items[QUICKSCREEN_BOTTOM] =
get_setting(global_settings.qs_items[QUICKSCREEN_BOTTOM], get_setting(global_settings.qs_items[QUICKSCREEN_BOTTOM],
find_setting(&global_settings.dirfilter, NULL)); find_setting(&global_settings.dirfilter, NULL));
@ -466,4 +473,3 @@ void set_as_qs_item(const struct settings_list *setting,
global_settings.qs_items[item] = i; global_settings.qs_items[item] = i;
} }