diff options
| -rw-r--r-- | TESTS | 5 | ||||
| -rw-r--r-- | src/boards/advanced_colors.c | 7 | ||||
| -rw-r--r-- | src/boards/colors.c | 3 | ||||
| -rw-r--r-- | src/boards/read_colors.c | 11 |
4 files changed, 17 insertions, 9 deletions
@@ -102,10 +102,13 @@ wordsgame ---------------------------------------------- imageid + - tested by Pascal Georges <pascal.georges1@free.fr> ---------------------------------------------- missing_letter + - tested by Pascal Georges <pascal.georges1@free.fr> ---------------------------------------------- click_on_letter + - tested by Pascal Georges <pascal.georges1@free.fr> ---------------------------------------------- railroad ---------------------------------------------- @@ -118,3 +121,5 @@ - tested by Pascal Georges <pascal.georges1@free.fr> ---------------------------------------------- colors + - tested by Pascal Georges <pascal.georges1@free.fr> + diff --git a/src/boards/advanced_colors.c b/src/boards/advanced_colors.c index 8a0b3ec..8843bbb 100644 --- a/src/boards/advanced_colors.c +++ b/src/boards/advanced_colors.c @@ -133,7 +133,7 @@ static void start_board (GcomprisBoard *agcomprisBoard) { gcomprisBoard->sublevel = 1; gcomprisBoard->number_of_sublevel = 8; - gcompris_bar_set(GCOMPRIS_BAR_OK | GCOMPRIS_BAR_LEVEL); + gcompris_bar_set(GCOMPRIS_BAR_LEVEL); gcompris_score_start(SCORESTYLE_NOTE, gcomprisBoard->width - 220, gcomprisBoard->height - 50, @@ -373,8 +373,9 @@ static gint item_event(GnomeCanvasItem *item, GdkEvent *event, gpointer data) { } } if (clicked >= 0) { - highlight_selected(clicked); - gamewon = (clicked == GPOINTER_TO_INT(g_list_nth_data(listColors,0))); + highlight_selected(clicked); + gamewon = (clicked == GPOINTER_TO_INT(g_list_nth_data(listColors,0))); + process_ok(); } break; diff --git a/src/boards/colors.c b/src/boards/colors.c index eb67a03..31560cc 100644 --- a/src/boards/colors.c +++ b/src/boards/colors.c @@ -116,7 +116,7 @@ static void start_board (GcomprisBoard *agcomprisBoard) { gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), "colors/colors_bg.jpg"); gcomprisBoard->level=1; gcomprisBoard->maxlevel=1; - gcompris_bar_set(GCOMPRIS_BAR_OK|GCOMPRIS_BAR_REPEAT); + gcompris_bar_set(GCOMPRIS_BAR_REPEAT); gamewon = FALSE; @@ -287,6 +287,7 @@ static gint item_event(GnomeCanvasItem *item, GdkEvent *event, gpointer data) { if (clicked >= 0) { highlight_selected(clicked); gamewon = (clicked == GPOINTER_TO_INT(g_list_nth_data(listColors,0))); + process_ok(); } break; diff --git a/src/boards/read_colors.c b/src/boards/read_colors.c index d3d3ccc..e9a004a 100644 --- a/src/boards/read_colors.c +++ b/src/boards/read_colors.c @@ -134,7 +134,7 @@ static void start_board (GcomprisBoard *agcomprisBoard) { gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), "read_colors/read_colors_background.png"); gcomprisBoard->level=1; gcomprisBoard->maxlevel=1; - gcompris_bar_set(GCOMPRIS_BAR_OK); + gcompris_bar_set(0); gamewon = FALSE; errors = MAX_ERRORS; @@ -341,13 +341,13 @@ static void process_ok() { static gint item_event(GnomeCanvasItem *item, GdkEvent *event, gpointer data) { double x, y; int i, j, clicked; - + x = event->button.x; y = event->button.y; if(board_paused) return FALSE; - + switch (event->type) { case GDK_BUTTON_PRESS: @@ -361,8 +361,9 @@ static gint item_event(GnomeCanvasItem *item, GdkEvent *event, gpointer data) { } if (clicked >= 0) { - highlight_selected(clicked); - gamewon = (clicked == GPOINTER_TO_INT(g_list_nth_data(listColors,0))); + highlight_selected(clicked); + gamewon = (clicked == GPOINTER_TO_INT(g_list_nth_data(listColors,0))); + process_ok(); } break; |