nihilazo/rockbox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

FS#10722: some improvements for gui/list.c

Browse Source 
* Add function list_get_nb_lines and replace duplicated codes to calculate number of lines by it.
* Refine calculation of start_item in function gui_list_put_selection_on_screen.
- displays as many items as possible. hopefully fix FS#10054.
* Fix checking bounds in function gui_synclist_item_is_onscreen.
* Remove trailing spaces and fix indents.

Flyspray: FS#10722
Author: myself


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23367 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Teruaki Kawashima 2009-10-27 13:18:54 +00:00
parent 03f88d53ee
commit 478afc3d62
1 changed files with 89 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
apps/gui/list.c
View File

@ -109,6 +109,14 @@ bool list_display_title(struct gui_synclist *list, enum screen_type screen)
return list->title != NULL &&
viewport_get_nb_lines(list->parent[screen]) > 2;
}
static int list_get_nb_lines(struct gui_synclist *list, enum screen_type screen)
{
struct viewport vp = *list->parent[screen];
if (list_display_title(list, screen))
vp.height -= font_get(list->parent[screen]->font)->height;
return viewport_get_nb_lines(&vp);
}
#else
static struct viewport parent[NB_SCREENS] =
{
@ -121,6 +129,8 @@ static struct viewport parent[NB_SCREENS] =
},
};
#define list_display_title(l, i) false
#define list_get_nb_lines(list, screen) \
viewport_get_nb_lines((list)->parent[(screen)]);
#endif
/*
@ -200,29 +210,28 @@ int gui_list_get_item_offset(struct gui_synclist * gui_list,
}
else
{
/* if text is smaller then view */
/* if text is smaller than view */
if (item_width <= vp->width - text_pos)
{
item_offset = 0;
}
else
{
/* if text got out of view */
if (gui_list->offset_position[display->screen_type] >
else if (gui_list->offset_position[display->screen_type] >
item_width - (vp->width - text_pos))
{
item_offset = item_width - (vp->width - text_pos);
}
else
item_offset = gui_list->offset_position[display->screen_type];
}
}
return item_offset;
}
#endif
/*
* Force a full screen update.
*/
void gui_synclist_draw(struct gui_synclist *gui_list)
{
int i;
@ -243,68 +252,58 @@ void gui_synclist_draw(struct gui_synclist *gui_list)
static void gui_list_put_selection_on_screen(struct gui_synclist * gui_list,
enum screen_type screen)
{
int nb_lines;
int nb_lines = list_get_nb_lines(gui_list, screen);
int bottom = MAX(0, gui_list->nb_items - nb_lines);
int new_start_item = gui_list->start_item[screen];
int difference = gui_list->selected_item - gui_list->start_item[screen];
struct viewport vp = *gui_list->parent[screen];
#ifdef HAVE_LCD_BITMAP
if (list_display_title(gui_list, screen))
vp.height -= font_get(gui_list->parent[screen]->font)->height;
#endif
nb_lines = viewport_get_nb_lines(&vp);
/* edge case,, selected last item */
/* edge case, selected last item */
if (gui_list->selected_item == gui_list->nb_items -1)
{
gui_list->start_item[screen] = MAX(0, gui_list->nb_items - nb_lines);
new_start_item = bottom;
}
/* selected first item */
else if (gui_list->selected_item == 0)
{
gui_list->start_item[screen] = 0;
new_start_item = 0;
}
else if (difference < SCROLL_LIMIT) /* list moved up */
{
if (global_settings.scroll_paginated)
{
if (gui_list->start_item[screen] > gui_list->selected_item)
{
gui_list->start_item[screen] = (gui_list->selected_item/nb_lines)
*nb_lines;
}
if (gui_list->nb_items <= nb_lines)
gui_list->start_item[screen] = 0;
if (new_start_item > gui_list->selected_item)
new_start_item = (gui_list->selected_item/nb_lines)*nb_lines;
}
else
{
int top_of_screen = gui_list->selected_item - SCROLL_LIMIT + 1;
int temp = MIN(top_of_screen, gui_list->nb_items - nb_lines);
gui_list->start_item[screen] = MAX(0, temp);
new_start_item = gui_list->selected_item - SCROLL_LIMIT + 1;
}
}
else if (difference > nb_lines - SCROLL_LIMIT) /* list moved down */
{
int bottom = gui_list->nb_items - nb_lines;
/* always move the screen if selection isnt "visible" */
if (gui_list->show_selection_marker == false)
{
if (bottom < 0)
bottom = 0;
gui_list->start_item[screen] = MIN(bottom, gui_list->start_item[screen] +
2*gui_list->selected_size);
new_start_item += 2*gui_list->selected_size;
}
else if (global_settings.scroll_paginated)
{
if (gui_list->start_item[screen] + nb_lines <= gui_list->selected_item)
gui_list->start_item[screen] = MIN(bottom, gui_list->selected_item);
if (new_start_item + nb_lines <= gui_list->selected_item)
new_start_item = (gui_list->selected_item/nb_lines)*nb_lines;
}
else
{
int top_of_screen = gui_list->selected_item + SCROLL_LIMIT - nb_lines;
int temp = MAX(0, top_of_screen);
gui_list->start_item[screen] = MIN(bottom, temp);
new_start_item = gui_list->selected_item + SCROLL_LIMIT - nb_lines;
}
}
if (new_start_item < 0)
gui_list->start_item[screen] = 0;
else if (new_start_item > bottom)
gui_list->start_item[screen] = bottom;
else
gui_list->start_item[screen] = new_start_item;
}
/*
* Selects an item in the list
* - gui_list : the list structure
@ -313,7 +312,7 @@ static void gui_list_put_selection_on_screen(struct gui_synclist * gui_list,
void gui_synclist_select_item(struct gui_synclist * gui_list, int item_number)
{
int i;
if( item_number > gui_list->nb_items-1 || item_number < 0 )
if (item_number >= gui_list->nb_items || item_number < 0)
return;
gui_list->selected_item = item_number;
FOR_NB_SCREENS(i)
@ -346,17 +345,10 @@ static void gui_list_select_at_offset(struct gui_synclist * gui_list,
int i, nb_lines, screen_top;
FOR_NB_SCREENS(i)
{
struct viewport vp = *gui_list->parent[i];
#ifdef HAVE_LCD_BITMAP
if (list_display_title(gui_list, i))
vp.height -= font_get(gui_list->parent[i]->font)->height;
#endif
nb_lines = viewport_get_nb_lines(&vp);
nb_lines = list_get_nb_lines(gui_list, i);
if (offset > 0)
{
screen_top = gui_list->nb_items-nb_lines;
if (screen_top < 0)
screen_top = 0;
screen_top = MAX(0, gui_list->nb_items - nb_lines);
gui_list->start_item[i] = MIN(screen_top, gui_list->start_item[i] +
gui_list->selected_size);
gui_list->selected_item = gui_list->start_item[i];
@ -422,7 +414,8 @@ void gui_synclist_set_title(struct gui_synclist * gui_list,
{
gui_list->title = title;
gui_list->title_icon = icon;
if (title) {
if (title)
{
#ifdef HAVE_LCD_BITMAP
int i;
FOR_NB_SCREENS(i)
@ -430,12 +423,13 @@ void gui_synclist_set_title(struct gui_synclist * gui_list,
#else
gui_list->title_width = strlen(title);
#endif
} else {
}
else
{
gui_list->title_width = 0;
}
}
void gui_synclist_set_nb_items(struct gui_synclist * lists, int nb_items)
{
#ifdef HAVE_LCD_BITMAP
@ -480,22 +474,14 @@ void gui_synclist_set_color_callback(struct gui_synclist * lists,
static void gui_synclist_select_next_page(struct gui_synclist * lists,
enum screen_type screen)
{
int nb_lines = viewport_get_nb_lines(lists->parent[screen]);
#ifdef HAVE_LCD_BITMAP
if(list_display_title(lists, screen))
nb_lines--;
#endif
int nb_lines = list_get_nb_lines(lists, screen);
gui_list_select_at_offset(lists, nb_lines);
}
static void gui_synclist_select_previous_page(struct gui_synclist * lists,
enum screen_type screen)
{
int nb_lines = viewport_get_nb_lines(lists->parent[screen]);
#ifdef HAVE_LCD_BITMAP
if(list_display_title(lists, screen))
nb_lines--;
#endif
int nb_lines = list_get_nb_lines(lists, screen);
gui_list_select_at_offset(lists, -nb_lines);
}
@ -783,12 +769,8 @@ bool list_do_action(int context, int timeout,
bool gui_synclist_item_is_onscreen(struct gui_synclist *lists,
enum screen_type screen, int item)
{
struct viewport vp = *lists->parent[screen];
#ifdef HAVE_LCD_BITMAP
if (list_display_title(lists, screen))
vp.height -= font_get(lists->parent[screen]->font)->height;
#endif
return item <= (lists->start_item[screen] + viewport_get_nb_lines(&vp));
int nb_lines = list_get_nb_lines(lists, screen);
return (unsigned)(item - lists->start_item[screen]) < (unsigned) nb_lines;
}
/* Simple use list implementation */
@ -810,7 +792,8 @@ int simplelist_get_line_count(void)
return simplelist_line_count;
}
/* add/edit a line in the list.
if line_number > number of lines shown it adds the line, else it edits the line */
if line_number > number of lines shown it adds the line,
else it edits the line */
void simplelist_addline(int line_number, const char *fmt, ...)
{
va_list ap;
@ -867,7 +850,8 @@ bool simplelist_show_list(struct simplelist_info *info)
info->action_callback(ACTION_REDRAW, &lists);
if (info->get_name == NULL)
gui_synclist_set_nb_items(&lists, simplelist_line_count*info->selection_size);
gui_synclist_set_nb_items(&lists,
simplelist_line_count*info->selection_size);
else
gui_synclist_set_nb_items(&lists, info->count*info->selection_size);