From eed41ff985ba92181a00e6a060dc460828feb7dc Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Tue, 23 Oct 2007 14:33:16 +0000 Subject: mrobe changes: stop it thinking the battery is always flat and shutting down add keymap for time/date screen pressing a list item will highlight it before accepting it (looks better than it just entering the item without the selection changing first) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15280 a1c6a512-1295-4272-9138-f99709370657 --- apps/action.c | 2 +- apps/gui/list.c | 13 ++++++++++++- apps/keymaps/keymap-mr500.c | 6 ++++++ 3 files changed, 19 insertions(+), 2 deletions(-) (limited to 'apps') diff --git a/apps/action.c b/apps/action.c index 989313f41c..7f445c8b9f 100644 --- a/apps/action.c +++ b/apps/action.c @@ -301,6 +301,6 @@ int action_get_touchpad_press(short *x, short *y) return BUTTON_REPEAT; if (short_press) return BUTTON_REL; - return BUTTON_NONE; + return BUTTON_TOUCHPAD; } #endif diff --git a/apps/gui/list.c b/apps/gui/list.c index e7de12c4a0..6f61a61992 100644 --- a/apps/gui/list.c +++ b/apps/gui/list.c @@ -918,6 +918,8 @@ unsigned gui_synclist_do_touchpad(struct gui_synclist * lists) short x,y; unsigned button = action_get_touchpad_press(&x, &y); int line; + if (button == BUTTON_NONE) + return ACTION_NONE; if (xdisplay->char_height; + line = y / gui_list->display->char_height; + if (line != gui_list->selected_item - gui_list->start_item) + gui_synclist_select_item(lists, gui_list->start_item+line); + return ACTION_REDRAW; + } /* title or statusbar is cancel */ if (global_settings.statusbar) { diff --git a/apps/keymaps/keymap-mr500.c b/apps/keymaps/keymap-mr500.c index b2444c5fad..b0d75c15bf 100755 --- a/apps/keymaps/keymap-mr500.c +++ b/apps/keymaps/keymap-mr500.c @@ -86,6 +86,12 @@ static const struct button_mapping button_context_listtree_scroll_without_combo[ }; static const struct button_mapping button_context_settings[] = { + { ACTION_SETTINGS_INC, BUTTON_RC_VOL_UP, BUTTON_NONE }, + { ACTION_SETTINGS_INCREPEAT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_SETTINGS_DEC, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, + { ACTION_SETTINGS_DECREPEAT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_STD_OK, BUTTON_RC_HEART, BUTTON_NONE }, + { ACTION_STD_CANCEL, BUTTON_RC_MODE, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settings */ -- cgit v1.2.3