diff options
author | Shachar Liberman <lshachar@hotmail.com> | 2006-08-12 13:40:49 +0000 |
---|---|---|
committer | Shachar Liberman <lshachar@hotmail.com> | 2006-08-12 13:40:49 +0000 |
commit | f53779d2f41fc2bcfff5196a279e2192992880e2 (patch) | |
tree | 1864b3fad8203705f2d07f16ed61e0c13d3c10a9 /apps/gui | |
parent | 54ec1f5f6db24ab90046b7cbab371c99e239f67e (diff) | |
download | rockbox-f53779d2f41fc2bcfff5196a279e2192992880e2.tar.gz rockbox-f53779d2f41fc2bcfff5196a279e2192992880e2.zip |
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.c | 4 | ||||
-rw-r--r-- | apps/gui/list.h | 22 |
2 files changed, 20 insertions, 6 deletions
diff --git a/apps/gui/list.c b/apps/gui/list.c index 67c0f3055d..ebb915e0bc 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) | |||
651 | 651 | ||
652 | #ifdef LIST_PGRIGHT | 652 | #ifdef LIST_PGRIGHT |
653 | case LIST_PGRIGHT: | 653 | case LIST_PGRIGHT: |
654 | #if !(LIST_PGRIGHT & BUTTON_REPEAT) | ||
654 | case LIST_PGRIGHT | BUTTON_REPEAT: | 655 | case LIST_PGRIGHT | BUTTON_REPEAT: |
656 | #endif | ||
655 | #ifdef LIST_RC_PGRIGHT | 657 | #ifdef LIST_RC_PGRIGHT |
656 | case LIST_RC_PGRIGHT: | 658 | case LIST_RC_PGRIGHT: |
657 | case LIST_RC_PGRIGHT | BUTTON_REPEAT: | 659 | case LIST_RC_PGRIGHT | BUTTON_REPEAT: |
@@ -663,7 +665,9 @@ unsigned gui_synclist_do_button(struct gui_synclist * lists, unsigned button) | |||
663 | 665 | ||
664 | #ifdef LIST_PGLEFT | 666 | #ifdef LIST_PGLEFT |
665 | case LIST_PGLEFT: | 667 | case LIST_PGLEFT: |
668 | #if !(LIST_PGLEFT & BUTTON_REPEAT) | ||
666 | case LIST_PGLEFT | BUTTON_REPEAT: | 669 | case LIST_PGLEFT | BUTTON_REPEAT: |
670 | #endif | ||
667 | #ifdef LIST_RC_PGLEFT | 671 | #ifdef LIST_RC_PGLEFT |
668 | case LIST_RC_PGLEFT: | 672 | case LIST_RC_PGLEFT: |
669 | case LIST_RC_PGLEFT | BUTTON_REPEAT: | 673 | case LIST_RC_PGLEFT | BUTTON_REPEAT: |
diff --git a/apps/gui/list.h b/apps/gui/list.h index b898e14f37..f0a6d3f32c 100644 --- a/apps/gui/list.h +++ b/apps/gui/list.h | |||
@@ -33,8 +33,8 @@ | |||
33 | #define LIST_PREV BUTTON_UP | 33 | #define LIST_PREV BUTTON_UP |
34 | #define LIST_PGUP (BUTTON_ON | BUTTON_UP) | 34 | #define LIST_PGUP (BUTTON_ON | BUTTON_UP) |
35 | #define LIST_PGDN (BUTTON_ON | BUTTON_DOWN) | 35 | #define LIST_PGDN (BUTTON_ON | BUTTON_DOWN) |
36 | #define LIST_PGRIGHT (BUTTON_ON | BUTTON_RIGHT) | 36 | #define LIST_PGRIGHT (BUTTON_RIGHT | BUTTON_REPEAT) |
37 | #define LIST_PGLEFT (BUTTON_ON | BUTTON_LEFT) | 37 | #define LIST_PGLEFT (BUTTON_LEFT | BUTTON_REPEAT) |
38 | 38 | ||
39 | #ifdef CONFIG_REMOTE_KEYPAD | 39 | #ifdef CONFIG_REMOTE_KEYPAD |
40 | #define LIST_RC_NEXT BUTTON_RC_FF | 40 | #define LIST_RC_NEXT BUTTON_RC_FF |
@@ -50,8 +50,8 @@ | |||
50 | #define LIST_PREV BUTTON_UP | 50 | #define LIST_PREV BUTTON_UP |
51 | #define LIST_PGUP (BUTTON_ON | BUTTON_UP) | 51 | #define LIST_PGUP (BUTTON_ON | BUTTON_UP) |
52 | #define LIST_PGDN (BUTTON_ON | BUTTON_DOWN) | 52 | #define LIST_PGDN (BUTTON_ON | BUTTON_DOWN) |
53 | #define LIST_PGRIGHT (BUTTON_ON | BUTTON_RIGHT) | 53 | #define LIST_PGRIGHT (BUTTON_RIGHT | BUTTON_REPEAT) |
54 | #define LIST_PGLEFT (BUTTON_ON | BUTTON_LEFT) | 54 | #define LIST_PGLEFT (BUTTON_LEFT | BUTTON_REPEAT) |
55 | 55 | ||
56 | #define LIST_RC_NEXT BUTTON_RC_RIGHT | 56 | #define LIST_RC_NEXT BUTTON_RC_RIGHT |
57 | #define LIST_RC_PREV BUTTON_RC_LEFT | 57 | #define LIST_RC_PREV BUTTON_RC_LEFT |
@@ -72,30 +72,40 @@ | |||
72 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) | 72 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) |
73 | #define LIST_NEXT BUTTON_SCROLL_FWD | 73 | #define LIST_NEXT BUTTON_SCROLL_FWD |
74 | #define LIST_PREV BUTTON_SCROLL_BACK | 74 | #define LIST_PREV BUTTON_SCROLL_BACK |
75 | #define LIST_PGRIGHT (BUTTON_RIGHT | BUTTON_REPEAT) | ||
76 | #define LIST_PGLEFT (BUTTON_LEFT | BUTTON_REPEAT) | ||
75 | 77 | ||
76 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | 78 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD |
77 | #define LIST_NEXT BUTTON_DOWN | 79 | #define LIST_NEXT BUTTON_DOWN |
78 | #define LIST_PREV BUTTON_UP | 80 | #define LIST_PREV BUTTON_UP |
81 | //#define LIST_PGRIGHT (BUTTON_RIGHT | BUTTON_) | ||
82 | //#define LIST_PGLEFT (BUTTON_LEFT | BUTTON_) Todo: define those | ||
79 | 83 | ||
80 | #elif CONFIG_KEYPAD == GMINI100_PAD | 84 | #elif CONFIG_KEYPAD == GMINI100_PAD |
81 | #define LIST_NEXT BUTTON_DOWN | 85 | #define LIST_NEXT BUTTON_DOWN |
82 | #define LIST_PREV BUTTON_UP | 86 | #define LIST_PREV BUTTON_UP |
83 | #define LIST_PGUP (BUTTON_ON | BUTTON_UP) | 87 | #define LIST_PGUP (BUTTON_ON | BUTTON_UP) |
84 | #define LIST_PGDN (BUTTON_ON | BUTTON_DOWN) | 88 | #define LIST_PGDN (BUTTON_ON | BUTTON_DOWN) |
85 | #define LIST_PGRIGHT (BUTTON_ON | BUTTON_RIGHT) | 89 | #define LIST_PGRIGHT (BUTTON_RIGHT | BUTTON_REPEAT) |
86 | #define LIST_PGLEFT (BUTTON_ON | BUTTON_LEFT) | 90 | #define LIST_PGLEFT (BUTTON_LEFT | BUTTON_REPEAT) |
87 | 91 | ||
88 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 92 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD |
89 | #define LIST_NEXT BUTTON_DOWN | 93 | #define LIST_NEXT BUTTON_DOWN |
90 | #define LIST_PREV BUTTON_UP | 94 | #define LIST_PREV BUTTON_UP |
95 | #define LIST_PGRIGHT (BUTTON_RIGHT | BUTTON_REPEAT) | ||
96 | #define LIST_PGLEFT (BUTTON_LEFT | BUTTON_REPEAT) | ||
91 | 97 | ||
92 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 98 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
93 | #define LIST_NEXT BUTTON_DOWN | 99 | #define LIST_NEXT BUTTON_DOWN |
94 | #define LIST_PREV BUTTON_UP | 100 | #define LIST_PREV BUTTON_UP |
101 | #define LIST_PGRIGHT (BUTTON_RIGHT | BUTTON_REPEAT) | ||
102 | #define LIST_PGLEFT (BUTTON_LEFT | BUTTON_REPEAT) | ||
95 | 103 | ||
96 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 104 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
97 | #define LIST_NEXT BUTTON_SCROLL_DOWN | 105 | #define LIST_NEXT BUTTON_SCROLL_DOWN |
98 | #define LIST_PREV BUTTON_SCROLL_UP | 106 | #define LIST_PREV BUTTON_SCROLL_UP |
107 | #define LIST_PGRIGHT (BUTTON_RIGHT | BUTTON_REPEAT) | ||
108 | #define LIST_PGLEFT (BUTTON_LEFT | BUTTON_REPEAT) | ||
99 | 109 | ||
100 | #endif | 110 | #endif |
101 | 111 | ||