Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Clix: Make Clix respect the global touchscreen setting when in a menu.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22132 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Karl Kurbjun 2009-08-03 02:56:55 +00:00
parent e18b8f3856
commit 4bc1646263
1 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
apps/plugins/clix.c
View file

@ -596,6 +596,8 @@ static int clix_menu(struct clix_game_state_t* state, bool ingame)
{ {
rb->button_clear_queue(); rb->button_clear_queue();
int choice = 0; int choice = 0;
bool leave_menu=false;
int ret=0;
_ingame = ingame; _ingame = ingame;
@ -607,16 +609,26 @@ static int clix_menu(struct clix_game_state_t* state, bool ingame)
"Playback Control", "Playback Control",
"Quit"); "Quit");
while (true) { /* Entering Menu, set the touchscreen to the global setting */
rb->touchscreen_set_mode(rb->global_settings->touch_mode);
while (!leave_menu) {
switch (rb->do_menu(&main_menu, &choice, NULL, false)) { switch (rb->do_menu(&main_menu, &choice, NULL, false)) {
case 0: case 0:
return 0; leave_menu=true;
ret = 0;
break;
case 1: case 1:
clix_init(state); clix_init(state);
return 0; leave_menu=true;
ret = 0;
break;
case 2: case 2:
if (clix_help()) if (clix_help()) {
return 1; leave_menu=true;
ret = 1;
}
break; break;
case 3: case 3:
highscore_show(NUM_SCORES, highest, NUM_SCORES, true); highscore_show(NUM_SCORES, highest, NUM_SCORES, true);
@ -626,11 +638,18 @@ static int clix_menu(struct clix_game_state_t* state, bool ingame)
break; break;
case 5: case 5:
case MENU_ATTACHED_USB: case MENU_ATTACHED_USB:
return 1; leave_menu=true;
ret = 1;
break;
default: default:
break; break;
} }
} }
/* Leaving the menu, set back to pointer mode */
rb->touchscreen_set_mode(TOUCHSCREEN_POINT);
return ret;
} }
static int clix_handle_game(struct clix_game_state_t* state) static int clix_handle_game(struct clix_game_state_t* state)