diff options
author | Thomas Martitz <kugel@rockbox.org> | 2012-01-30 01:03:22 +0100 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2012-01-30 01:03:22 +0100 |
commit | e7892c9851da0f3506c380983fac0c019f773489 (patch) | |
tree | e459460d13f5af7c809f241380843734d9e5252f /apps | |
parent | 3e13fcddc6af9ead51f35d49f2d63c6bb8c7c6aa (diff) | |
download | rockbox-e7892c9851da0f3506c380983fac0c019f773489.tar.gz rockbox-e7892c9851da0f3506c380983fac0c019f773489.zip |
clix: Remove redundant touchscreen mode setting. Remove blocks on touch release (to avoid accidental moves).
Change-Id: Ie758e64bff5e7e4ae0f3ffe9e954b533cafb4bed
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugins/clix.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/apps/plugins/clix.c b/apps/plugins/clix.c index 4d6218f3fb..614b7563f3 100644 --- a/apps/plugins/clix.c +++ b/apps/plugins/clix.c | |||
@@ -654,11 +654,6 @@ static int clix_menu(struct clix_game_state_t* state, bool ingame) | |||
654 | "Playback Control", | 654 | "Playback Control", |
655 | "Quit"); | 655 | "Quit"); |
656 | 656 | ||
657 | #ifdef HAVE_TOUCHSCREEN | ||
658 | /* Entering Menu, set the touchscreen to the global setting */ | ||
659 | rb->touchscreen_set_mode(rb->global_settings->touch_mode); | ||
660 | #endif | ||
661 | |||
662 | while (!leave_menu) { | 657 | while (!leave_menu) { |
663 | 658 | ||
664 | switch (rb->do_menu(&main_menu, &choice, NULL, false)) { | 659 | 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) | |||
693 | } | 688 | } |
694 | } | 689 | } |
695 | 690 | ||
696 | #ifdef HAVE_TOUCHSCREEN | ||
697 | /* Leaving the menu, set back to pointer mode */ | ||
698 | rb->touchscreen_set_mode(TOUCHSCREEN_POINT); | ||
699 | #endif | ||
700 | |||
701 | return ret; | 691 | return ret; |
702 | } | 692 | } |
703 | 693 | ||
@@ -792,7 +782,7 @@ static int clix_handle_game(struct clix_game_state_t* state) | |||
792 | if(x < BOARD_WIDTH && y < BOARD_HEIGHT | 782 | if(x < BOARD_WIDTH && y < BOARD_HEIGHT |
793 | && state->board[XYPOS(x, y)] != CC_BLACK) | 783 | && state->board[XYPOS(x, y)] != CC_BLACK) |
794 | { | 784 | { |
795 | if(state->x == x && state->y == y) | 785 | if(state->x == x && state->y == y && button & BUTTON_REL) |
796 | button = CLIX_BUTTON_CLICK; | 786 | button = CLIX_BUTTON_CLICK; |
797 | else | 787 | else |
798 | { | 788 | { |