mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-10-28 16:26:21 -04:00
clix: Remove redundant touchscreen mode setting. Remove blocks on touch release (to avoid accidental moves).
Change-Id: Ie758e64bff5e7e4ae0f3ffe9e954b533cafb4bed
This commit is contained in:
parent
3e13fcddc6
commit
e7892c9851
1 changed files with 1 additions and 11 deletions
|
|
@ -654,11 +654,6 @@ static int clix_menu(struct clix_game_state_t* state, bool ingame)
|
||||||
"Playback Control",
|
"Playback Control",
|
||||||
"Quit");
|
"Quit");
|
||||||
|
|
||||||
#ifdef HAVE_TOUCHSCREEN
|
|
||||||
/* Entering Menu, set the touchscreen to the global setting */
|
|
||||||
rb->touchscreen_set_mode(rb->global_settings->touch_mode);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
while (!leave_menu) {
|
while (!leave_menu) {
|
||||||
|
|
||||||
switch (rb->do_menu(&main_menu, &choice, NULL, false)) {
|
switch (rb->do_menu(&main_menu, &choice, NULL, false)) {
|
||||||
|
|
@ -693,11 +688,6 @@ static int clix_menu(struct clix_game_state_t* state, bool ingame)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef HAVE_TOUCHSCREEN
|
|
||||||
/* Leaving the menu, set back to pointer mode */
|
|
||||||
rb->touchscreen_set_mode(TOUCHSCREEN_POINT);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -792,7 +782,7 @@ static int clix_handle_game(struct clix_game_state_t* state)
|
||||||
if(x < BOARD_WIDTH && y < BOARD_HEIGHT
|
if(x < BOARD_WIDTH && y < BOARD_HEIGHT
|
||||||
&& state->board[XYPOS(x, y)] != CC_BLACK)
|
&& state->board[XYPOS(x, y)] != CC_BLACK)
|
||||||
{
|
{
|
||||||
if(state->x == x && state->y == y)
|
if(state->x == x && state->y == y && button & BUTTON_REL)
|
||||||
button = CLIX_BUTTON_CLICK;
|
button = CLIX_BUTTON_CLICK;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue