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

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Tue Dec  9 22:38:20 2008
New Revision: 3638
URL: http://svn.gnome.org/viewvc/gcompris?rev=3638&view=rev

Log:
Fixed the bar centering


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	Tue Dec  9 22:38:20 2008
@@ -224,10 +224,7 @@
       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);
-
 
       menuitems = g_new(MenuItems, 1);
 

Modified: branches/gcomprixogoo/src/gcompris/bar.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/bar.c	(original)
+++ branches/gcomprixogoo/src/gcompris/bar.c	Tue Dec  9 22:38:20 2008
@@ -267,9 +267,9 @@
   update_exit_button();
 
   /* FIXME: Bootstrap for centering should not be needed */
-  gc_bar_set(GC_BAR_CONFIG|GC_BAR_ABOUT);
+  //  gc_bar_set(GC_BAR_CONFIG|GC_BAR_ABOUT);
   /* Set back the bar to it's original location */
-  gc_bar_location (-1, -1, -1);
+  //gc_bar_location (-1, -1, -1);
   gc_bar_set(0);
 
   _hidden = FALSE;
@@ -358,6 +358,9 @@
 void
 gc_bar_set (const GComprisBarFlags flags)
 {
+  // Always reset the zoom factor or the calculation
+  // will be wrong
+  gc_bar_location (-1, -1, -1);
 
   _hidden = FALSE;
   goo_canvas_item_raise(rootitem, NULL);
@@ -423,6 +426,8 @@
                         x / (bounds.x2 - bounds.x1),
                         1);
 
+  // Always center the bar with its new bounds
+  gc_bar_location (-1, -1, -1);
 }
 
 /* Hide all icons in the control bar