diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-09-05 19:04:23 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-09-05 19:04:23 +0000 |
commit | 9c938a23b93902c3d38204df68677d7455a313c3 (patch) | |
tree | 161d9052ba6cae607294867d7e4130cdc6cc294d /apps/gui/quickscreen.c | |
parent | 533c29b2f25ad836e4f704e75f22b66ab093119c (diff) | |
download | rockbox-9c938a23b93902c3d38204df68677d7455a313c3.tar.gz rockbox-9c938a23b93902c3d38204df68677d7455a313c3.zip |
Don't forget the touchscreen targets!
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22636 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui/quickscreen.c')
-rw-r--r-- | apps/gui/quickscreen.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/apps/gui/quickscreen.c b/apps/gui/quickscreen.c index 3eab14c5b5..639233b3b1 100644 --- a/apps/gui/quickscreen.c +++ b/apps/gui/quickscreen.c | |||
@@ -289,20 +289,21 @@ static bool gui_quickscreen_do_button(struct gui_quickscreen * qs, int button) | |||
289 | /* figure out which button was pressed... | 289 | /* figure out which button was pressed... |
290 | * top is exit, left/right/botton are the respective actions | 290 | * top is exit, left/right/botton are the respective actions |
291 | */ | 291 | */ |
292 | static int quickscreen_touchscreen_button(void) | 292 | static int quickscreen_touchscreen_button(const struct viewport |
293 | vps[QUICKSCREEN_ITEM_COUNT]) | ||
293 | { | 294 | { |
294 | short x,y; | 295 | short x,y; |
295 | if (action_get_touchscreen_press(&x, &y) != BUTTON_REL) | 296 | if (action_get_touchscreen_press(&x, &y) != BUTTON_REL) |
296 | return ACTION_NONE; | 297 | return ACTION_NONE; |
297 | if (y < vps[SCREEN_MAIN][QUICKSCREEN_LEFT].y) | 298 | if (y < vps[QUICKSCREEN_LEFT].y) |
298 | return ACTION_STD_CANCEL; | 299 | return ACTION_STD_CANCEL; |
299 | else if (y > vps[SCREEN_MAIN][QUICKSCREEN_LEFT].y + | 300 | else if (y > vps[QUICKSCREEN_LEFT].y + |
300 | vps[SCREEN_MAIN][QUICKSCREEN_LEFT].height) | 301 | vps[QUICKSCREEN_LEFT].height) |
301 | return ACTION_QS_DOWN; | 302 | return ACTION_QS_DOWN; |
302 | else if (x < vps[SCREEN_MAIN][QUICKSCREEN_LEFT].x + | 303 | else if (x < vps[QUICKSCREEN_LEFT].x + |
303 | vps[SCREEN_MAIN][QUICKSCREEN_LEFT].width) | 304 | vps[QUICKSCREEN_LEFT].width) |
304 | return ACTION_QS_LEFT; | 305 | return ACTION_QS_LEFT; |
305 | else if (x >= vps[SCREEN_MAIN][QUICKSCREEN_RIGHT].x) | 306 | else if (x >= vps[QUICKSCREEN_RIGHT].x) |
306 | return ACTION_QS_RIGHT; | 307 | return ACTION_QS_RIGHT; |
307 | return ACTION_STD_CANCEL; | 308 | return ACTION_STD_CANCEL; |
308 | } | 309 | } |
@@ -339,7 +340,7 @@ static bool gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_ente | |||
339 | button = get_action(CONTEXT_QUICKSCREEN,HZ/5); | 340 | button = get_action(CONTEXT_QUICKSCREEN,HZ/5); |
340 | #ifdef HAVE_TOUCHSCREEN | 341 | #ifdef HAVE_TOUCHSCREEN |
341 | if (button == ACTION_TOUCHSCREEN) | 342 | if (button == ACTION_TOUCHSCREEN) |
342 | button = quickscreen_touchscreen_button(); | 343 | button = quickscreen_touchscreen_button(vps[SCREEN_MAIN]); |
343 | #endif | 344 | #endif |
344 | if(default_event_handler(button) == SYS_USB_CONNECTED) | 345 | if(default_event_handler(button) == SYS_USB_CONNECTED) |
345 | return(true); | 346 | return(true); |