gcompris r3534 - in branches/gcomprixogoo/src: algebra_guesscount-activity enumerate-activity planegame-activity target-activity

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Sun Sep  7 23:14:07 2008
New Revision: 3534
URL: http://svn.gnome.org/viewvc/gcompris?rev=3534&view=rev

Log:
Some more bar adaptation


Modified:
   branches/gcomprixogoo/src/algebra_guesscount-activity/algebra_guesscount.c
   branches/gcomprixogoo/src/enumerate-activity/enumerate.c
   branches/gcomprixogoo/src/planegame-activity/planegame.c
   branches/gcomprixogoo/src/target-activity/target.c

Modified: branches/gcomprixogoo/src/algebra_guesscount-activity/algebra_guesscount.c
==============================================================================
--- branches/gcomprixogoo/src/algebra_guesscount-activity/algebra_guesscount.c	(original)
+++ branches/gcomprixogoo/src/algebra_guesscount-activity/algebra_guesscount.c	Sun Sep  7 23:14:07 2008
@@ -215,9 +215,9 @@
     gcomprisBoard->sublevel=1;
     gcomprisBoard->number_of_sublevel=NUMBER_OF_SUBLEVELS; /* Go to next level after this number of 'play' */
     gc_score_start(SCORESTYLE_NOTE,
-			 50,
-			 BOARDHEIGHT - 50,
-			 gcomprisBoard->number_of_sublevel);
+                   BOARDWIDTH - 195,
+                   BOARDHEIGHT - 30,
+                   gcomprisBoard->number_of_sublevel);
     gc_bar_set(GC_BAR_LEVEL);
 
     algebra_guesscount_next_level();

Modified: branches/gcomprixogoo/src/enumerate-activity/enumerate.c
==============================================================================
--- branches/gcomprixogoo/src/enumerate-activity/enumerate.c	(original)
+++ branches/gcomprixogoo/src/enumerate-activity/enumerate.c	Sun Sep  7 23:14:07 2008
@@ -407,7 +407,7 @@
 	  guint x, y;
 
 	  x = g_random_int_range(0, ANSWER_X-gdk_pixbuf_get_width(pixmap)-ANSWER_WIDTH);
-	  y = g_random_int_range(0, BOARDHEIGHT-gdk_pixbuf_get_height(pixmap));
+	  y = g_random_int_range(0, BOARDHEIGHT-BARHEIGHT-10-gdk_pixbuf_get_height(pixmap));
 
 	  item = goo_canvas_image_new (boardRootItem,
 				       pixmap,

Modified: branches/gcomprixogoo/src/planegame-activity/planegame.c
==============================================================================
--- branches/gcomprixogoo/src/planegame-activity/planegame.c	(original)
+++ branches/gcomprixogoo/src/planegame-activity/planegame.c	Sun Sep  7 23:14:07 2008
@@ -305,8 +305,8 @@
   else
     {
       gc_score_start(SCORESTYLE_NOTE,
-			   BOARDWIDTH - 220,
-			   BOARDHEIGHT - 50,
+			   BOARDWIDTH - 195,
+			   BOARDHEIGHT - 30,
 			   gcomprisBoard->number_of_sublevel);
       gc_score_set(gcomprisBoard->sublevel);
     }

Modified: branches/gcomprixogoo/src/target-activity/target.c
==============================================================================
--- branches/gcomprixogoo/src/target-activity/target.c	(original)
+++ branches/gcomprixogoo/src/target-activity/target.c	Sun Sep  7 23:14:07 2008
@@ -532,7 +532,7 @@
 static void request_score()
 {
   GdkPixbuf *button_pixmap = NULL;
-  double y_offset = 160;
+  double y_offset = 130;
   double x_offset = 245;
   gchar *tmpstr;