diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2009-03-02 19:25:50 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2009-03-02 19:25:50 +0000 |
| commit | fd14cac7c2feb471f8bf546d10e15f1336657064 (patch) | |
| tree | f0d9dfe4b1147a8f08659104a3ba150bb3a1e8f5 /apps/gui | |
| parent | 09f012a64fb129b3b7e16cc463a840b1eb5ded7d (diff) | |
| download | rockbox-fd14cac7c2feb471f8bf546d10e15f1336657064.zip rockbox-fd14cac7c2feb471f8bf546d10e15f1336657064.tar.gz rockbox-fd14cac7c2feb471f8bf546d10e15f1336657064.tar.bz2 rockbox-fd14cac7c2feb471f8bf546d10e15f1336657064.tar.xz | |
Split HAVE_SCROLLWHEEL into HAVE_SCROLLWHEEL and HAVE_WHEEL_ACCELERATION, where the latter now activates the wheel acceleration code.
HAVE_SCROLLWHEEL plainly indicates the existence of a scrollwheel, thus all ipods define it now (in addition to the ones and some
sansas which did before). Same applies to the manual.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20177 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
| -rw-r--r-- | apps/gui/list.c | 6 | ||||
| -rw-r--r-- | apps/gui/option_select.c | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/apps/gui/list.c b/apps/gui/list.c index 2923ec3..8df0a29 100644 --- a/apps/gui/list.c +++ b/apps/gui/list.c @@ -588,7 +588,7 @@ bool gui_synclist_do_button(struct gui_synclist * lists, static bool scrolling_left = false; #endif -#ifdef HAVE_SCROLLWHEEL +#ifdef HAVE_WHEEL_ACCELERATION int next_item_modifier = button_apply_acceleration(get_action_data()); #else static int next_item_modifier = 1; @@ -659,7 +659,7 @@ bool gui_synclist_do_button(struct gui_synclist * lists, case ACTION_STD_PREV: case ACTION_STD_PREVREPEAT: gui_list_select_at_offset(lists, -next_item_modifier); -#ifndef HAVE_SCROLLWHEEL +#ifndef HAVE_WHEEL_ACCELERATION if (button_queue_count() < FRAMEDROP_TRIGGER) #endif gui_synclist_draw(lists); @@ -673,7 +673,7 @@ bool gui_synclist_do_button(struct gui_synclist * lists, case ACTION_STD_NEXT: case ACTION_STD_NEXTREPEAT: gui_list_select_at_offset(lists, next_item_modifier); -#ifndef HAVE_SCROLLWHEEL +#ifndef HAVE_WHEEL_ACCELERATION if (button_queue_count() < FRAMEDROP_TRIGGER) #endif gui_synclist_draw(lists); diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c index 30df8ea..7223197 100644 --- a/apps/gui/option_select.c +++ b/apps/gui/option_select.c @@ -38,9 +38,6 @@ #include "quickscreen.h" #if defined (HAVE_SCROLLWHEEL) || \ - (CONFIG_KEYPAD == IPOD_3G_PAD) || \ - (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_1G2G_PAD) || \ (CONFIG_KEYPAD == PLAYER_PAD) /* Define this if your target makes sense to have smaller values at the top of the list increasing down the list */ |