gcompris r3575 - in branches/gcomprixogoo/src: boards gcompris

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Thu Oct 16 23:17:27 2008
New Revision: 3575
URL: http://svn.gnome.org/viewvc/gcompris?rev=3575&view=rev

Log:
better cetered bar


Modified:
   branches/gcomprixogoo/src/boards/menu2.c
   branches/gcomprixogoo/src/gcompris/bar.c

Modified: branches/gcomprixogoo/src/boards/menu2.c
==============================================================================
--- branches/gcomprixogoo/src/boards/menu2.c	(original)
+++ branches/gcomprixogoo/src/boards/menu2.c	Thu Oct 16 23:17:27 2008
@@ -224,8 +224,10 @@
       gcomprisBoard->maxlevel=1;
 
       /* Set back the bar to it's original location */
+      gc_bar_location (-1, -1, -1);
       gc_bar_set(GC_BAR_CONFIG|GC_BAR_ABOUT);
       gc_bar_set_level(gcomprisBoard);
+      /* FIXME: Bootstrap should not be needed */
       gc_bar_location (-1, -1, -1);
 
 

Modified: branches/gcomprixogoo/src/gcompris/bar.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/bar.c	(original)
+++ branches/gcomprixogoo/src/gcompris/bar.c	Thu Oct 16 23:17:27 2008
@@ -335,7 +335,7 @@
 
   GooCanvasBounds bounds;
   goo_canvas_item_get_bounds(rootitem, &bounds);
-  int nx = (x == -1 ? (BOARDWIDTH - bounds.x2 - bounds.x1)/2 : x);
+  int nx = (x == -1 ? (BOARDWIDTH - (bounds.x2 - bounds.x1))/2 : x);
   goo_canvas_item_translate(rootitem, nx, ny);
   goo_canvas_item_scale(rootitem,
 			(zoom == -1 ? _default_zoom : zoom),