summaryrefslogtreecommitdiff
path: root/apps/gui
diff options
context:
space:
mode:
authorShachar Liberman <lshachar@hotmail.com>2006-08-12 13:40:49 +0000
committerShachar Liberman <lshachar@hotmail.com>2006-08-12 13:40:49 +0000
commitf53779d2f41fc2bcfff5196a279e2192992880e2 (patch)
tree1864b3fad8203705f2d07f16ed61e0c13d3c10a9 /apps/gui
parent54ec1f5f6db24ab90046b7cbab371c99e239f67e (diff)
downloadrockbox-f53779d2f41fc2bcfff5196a279e2192992880e2.zip
rockbox-f53779d2f41fc2bcfff5196a279e2192992880e2.tar.gz
rockbox-f53779d2f41fc2bcfff5196a279e2192992880e2.tar.bz2
rockbox-f53779d2f41fc2bcfff5196a279e2192992880e2.tar.xz
Committing FS#5182 - One button hold for Horizontal screen scrolling.
=>hold RIGHT or LEFT button on a GUI based list to scroll horizontally. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10545 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
-rw-r--r--apps/gui/list.c4
-rw-r--r--apps/gui/list.h22
2 files changed, 20 insertions, 6 deletions
diff --git a/apps/gui/list.c b/apps/gui/list.c
index 67c0f30..ebb915e 100644
--- a/apps/gui/list.c
+++ b/apps/gui/list.c
@@ -651,7 +651,9 @@ unsigned gui_synclist_do_button(struct gui_synclist * lists, unsigned button)
#ifdef LIST_PGRIGHT
case LIST_PGRIGHT:
+#if !(LIST_PGRIGHT & BUTTON_REPEAT)
case LIST_PGRIGHT | BUTTON_REPEAT:
+#endif
#ifdef LIST_RC_PGRIGHT
case LIST_RC_PGRIGHT:
case LIST_RC_PGRIGHT | BUTTON_REPEAT:
@@ -663,7 +665,9 @@ unsigned gui_synclist_do_button(struct gui_synclist * lists, unsigned button)
#ifdef LIST_PGLEFT
case LIST_PGLEFT:
+#if !(LIST_PGLEFT & BUTTON_REPEAT)
case LIST_PGLEFT | BUTTON_REPEAT:
+#endif
#ifdef LIST_RC_PGLEFT
case LIST_RC_PGLEFT:
case LIST_RC_PGLEFT | BUTTON_REPEAT:
diff --git a/apps/gui/list.h b/apps/gui/list.h
index b898e14..f0a6d3f 100644
--- a/apps/gui/list.h
+++ b/apps/gui/list.h
@@ -33,8 +33,8 @@
#define LIST_PREV BUTTON_UP
#define LIST_PGUP (BUTTON_ON | BUTTON_UP)
#define LIST_PGDN (BUTTON_ON | BUTTON_DOWN)
-#define LIST_PGRIGHT (BUTTON_ON | BUTTON_RIGHT)
-#define LIST_PGLEFT (BUTTON_ON | BUTTON_LEFT)
+#define LIST_PGRIGHT (BUTTON_RIGHT | BUTTON_REPEAT)
+#define LIST_PGLEFT (BUTTON_LEFT | BUTTON_REPEAT)
#ifdef CONFIG_REMOTE_KEYPAD
#define LIST_RC_NEXT BUTTON_RC_FF
@@ -50,8 +50,8 @@
#define LIST_PREV BUTTON_UP
#define LIST_PGUP (BUTTON_ON | BUTTON_UP)
#define LIST_PGDN (BUTTON_ON | BUTTON_DOWN)
-#define LIST_PGRIGHT (BUTTON_ON | BUTTON_RIGHT)
-#define LIST_PGLEFT (BUTTON_ON | BUTTON_LEFT)
+#define LIST_PGRIGHT (BUTTON_RIGHT | BUTTON_REPEAT)
+#define LIST_PGLEFT (BUTTON_LEFT | BUTTON_REPEAT)
#define LIST_RC_NEXT BUTTON_RC_RIGHT
#define LIST_RC_PREV BUTTON_RC_LEFT
@@ -72,30 +72,40 @@
#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD)
#define LIST_NEXT BUTTON_SCROLL_FWD
#define LIST_PREV BUTTON_SCROLL_BACK
+#define LIST_PGRIGHT (BUTTON_RIGHT | BUTTON_REPEAT)
+#define LIST_PGLEFT (BUTTON_LEFT | BUTTON_REPEAT)
#elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD
#define LIST_NEXT BUTTON_DOWN
#define LIST_PREV BUTTON_UP
+//#define LIST_PGRIGHT (BUTTON_RIGHT | BUTTON_)
+//#define LIST_PGLEFT (BUTTON_LEFT | BUTTON_) Todo: define those
#elif CONFIG_KEYPAD == GMINI100_PAD
#define LIST_NEXT BUTTON_DOWN
#define LIST_PREV BUTTON_UP
#define LIST_PGUP (BUTTON_ON | BUTTON_UP)
#define LIST_PGDN (BUTTON_ON | BUTTON_DOWN)
-#define LIST_PGRIGHT (BUTTON_ON | BUTTON_RIGHT)
-#define LIST_PGLEFT (BUTTON_ON | BUTTON_LEFT)
+#define LIST_PGRIGHT (BUTTON_RIGHT | BUTTON_REPEAT)
+#define LIST_PGLEFT (BUTTON_LEFT | BUTTON_REPEAT)
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
#define LIST_NEXT BUTTON_DOWN
#define LIST_PREV BUTTON_UP
+#define LIST_PGRIGHT (BUTTON_RIGHT | BUTTON_REPEAT)
+#define LIST_PGLEFT (BUTTON_LEFT | BUTTON_REPEAT)
#elif CONFIG_KEYPAD == GIGABEAT_PAD
#define LIST_NEXT BUTTON_DOWN
#define LIST_PREV BUTTON_UP
+#define LIST_PGRIGHT (BUTTON_RIGHT | BUTTON_REPEAT)
+#define LIST_PGLEFT (BUTTON_LEFT | BUTTON_REPEAT)
#elif CONFIG_KEYPAD == IRIVER_H10_PAD
#define LIST_NEXT BUTTON_SCROLL_DOWN
#define LIST_PREV BUTTON_SCROLL_UP
+#define LIST_PGRIGHT (BUTTON_RIGHT | BUTTON_REPEAT)
+#define LIST_PGLEFT (BUTTON_LEFT | BUTTON_REPEAT)
#endif