Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't actually reimplement an existing feature for hiding the selection marker

Browse source 
during scrolling.

However, the existing one is part of the list api, so it shouldn't be overridden
blindly internally, so do the decision in a different but equivalent way.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28147 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2010-09-23 00:37:33 +00:00
parent e5d43300af
commit f060cd5428
3 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
apps/gui/bitmap/list.c
View file

@ -47,6 +47,14 @@
/* these are static to make scrolling work */
static struct viewport list_text[NB_SCREENS], title_text[NB_SCREENS];
#ifdef HAVE_TOUCHSCREEN
static enum {
SCROLL_NONE, /* no scrolling */
SCROLL_BAR, /* scroll by using the scrollbar */
SCROLL_SWIPE, /* scroll by wiping over the screen */
} scroll_mode;
#endif
int gui_list_get_item_offset(struct gui_synclist * gui_list, int item_width,
int text_pos, struct screen * display,
struct viewport *vp);
@ -232,7 +240,12 @@ void list_draw(struct screen *display, struct gui_synclist *list)
}
#endif
/* draw the selected line */
if(!list->hide_selection && i >= list->selected_item
if(
#ifdef HAVE_TOUCHSCREEN
/* don't draw it during scrolling */
scroll_mode == SCROLL_NONE &&
#endif
i >= list->selected_item
&& i < list->selected_item + list->selected_size
&& list->show_selection_marker)
{/* The selected item must be displayed scrolling */
@ -311,11 +324,6 @@ void list_draw(struct screen *display, struct gui_synclist *list)
#if defined(HAVE_TOUCHSCREEN)
/* This needs to be fixed if we ever get more than 1 touchscreen on a target. */
static enum {
SCROLL_NONE, /* no scrolling */
SCROLL_BAR, /* scroll by using the scrollbar */
SCROLL_SWIPE, /* scroll by wiping over the screen */
} scroll_mode;
static bool released = false;
@ -390,10 +398,7 @@ unsigned gui_synclist_do_touchscreen(struct gui_synclist * gui_list)
int line, list_width = list_text_vp->width;
released = (button&BUTTON_REL) != 0;
gui_list->hide_selection = (scroll_mode != SCROLL_NONE);
if (global_settings.scrollbar == SCROLLBAR_RIGHT)
list_width += SCROLLBAR_WIDTH;
@ -511,8 +516,6 @@ unsigned gui_synclist_do_touchscreen(struct gui_synclist * gui_list)
{
scroll_mode = SCROLL_NONE;
redraw = true;
/* don't draw the selection during scrolling */
gui_list->hide_selection = false;
}
/* select current item */

1
apps/gui/list.c
View file

@ -155,7 +155,6 @@ void gui_synclist_init(struct gui_synclist * gui_list,
gui_list->callback_speak_item = NULL;
gui_list->nb_items = 0;
gui_list->selected_item = 0;
gui_list->hide_selection = false;
FOR_NB_SCREENS(i)
{
gui_list->start_item[i] = 0;

4
apps/gui/list.h
View file

@ -94,10 +94,6 @@ struct gui_synclist
/* wether the text of the whole items of the list have to be
* scrolled or only for the selected item */
bool scroll_all;
/*
* if true the selection bar will not be drawn
*/
bool hide_selection;
int nb_items;
int selected_item;
int start_item[NB_SCREENS]; /* the item that is displayed at the top of the screen */