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/menus/display_menu.c | |
parent | 09f012a64fb129b3b7e16cc463a840b1eb5ded7d (diff) | |
download | rockbox-fd14cac7c2feb471f8bf546d10e15f1336657064.tar.gz rockbox-fd14cac7c2feb471f8bf546d10e15f1336657064.zip |
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/menus/display_menu.c')
-rw-r--r-- | apps/menus/display_menu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c index dbc7206b91..d70cf37687 100644 --- a/apps/menus/display_menu.c +++ b/apps/menus/display_menu.c | |||
@@ -251,11 +251,11 @@ MENUITEM_SETTING(jump_scroll, &global_settings.jump_scroll, NULL); | |||
251 | MENUITEM_SETTING(jump_scroll_delay, &global_settings.jump_scroll_delay, NULL); | 251 | MENUITEM_SETTING(jump_scroll_delay, &global_settings.jump_scroll_delay, NULL); |
252 | #endif | 252 | #endif |
253 | /* list acceleration */ | 253 | /* list acceleration */ |
254 | #ifndef HAVE_SCROLLWHEEL | 254 | #ifndef HAVE_WHEEL_ACCELERATION |
255 | MENUITEM_SETTING(list_accel_start_delay, | 255 | MENUITEM_SETTING(list_accel_start_delay, |
256 | &global_settings.list_accel_start_delay, NULL); | 256 | &global_settings.list_accel_start_delay, NULL); |
257 | MENUITEM_SETTING(list_accel_wait, &global_settings.list_accel_wait, NULL); | 257 | MENUITEM_SETTING(list_accel_wait, &global_settings.list_accel_wait, NULL); |
258 | #endif /* HAVE_SCROLLWHEEL */ | 258 | #endif /* HAVE_WHEEL_ACCELERATION */ |
259 | #ifdef HAVE_LCD_BITMAP | 259 | #ifdef HAVE_LCD_BITMAP |
260 | static int screenscroll_callback(int action,const struct menu_item_ex *this_item) | 260 | static int screenscroll_callback(int action,const struct menu_item_ex *this_item) |
261 | { | 261 | { |
@@ -290,7 +290,7 @@ MAKE_MENU(scroll_settings_menu, ID2P(LANG_SCROLL_MENU), 0, Icon_NOICON, | |||
290 | &offset_out_of_view, &screen_scroll_step, | 290 | &offset_out_of_view, &screen_scroll_step, |
291 | #endif | 291 | #endif |
292 | &scroll_paginated, | 292 | &scroll_paginated, |
293 | #ifndef HAVE_SCROLLWHEEL | 293 | #ifndef HAVE_WHEEL_ACCELERATION |
294 | &list_accel_start_delay, &list_accel_wait | 294 | &list_accel_start_delay, &list_accel_wait |
295 | #endif | 295 | #endif |
296 | ); | 296 | ); |