[maemo-commits] [maemo-commits] r12519 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: xan
Date: 2007-06-27 19:11:01 +0300 (Wed, 27 Jun 2007)
New Revision: 12519

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkhbbox.c
   projects/haf/trunk/gtk+/gtk/gtkvbbox.c
Log:
2007-06-27  Xan Lopez  <xan.lopez at nokia.com>

	* gtk/gtkhbbox.c (gtk_hbutton_box_size_allocate):
	* gtk/gtkvbbox.c (gtk_vbutton_box_size_allocate):

	Fix the centering logic, this time for real...


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-06-27 15:25:43 UTC (rev 12518)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-06-27 16:11:01 UTC (rev 12519)
@@ -1,3 +1,10 @@
+2007-06-27  Xan Lopez  <xan.lopez at nokia.com>
+
+	* gtk/gtkhbbox.c (gtk_hbutton_box_size_allocate):
+	* gtk/gtkvbbox.c (gtk_vbutton_box_size_allocate):
+
+	Fix the centering logic, this time for real...
+
 2007-06-27  Michael Natterer  <mitch at imendio.com>
 
 	* gtk/gtkmenu.c (gtk_menu_handle_scrolling): when updating the

Modified: projects/haf/trunk/gtk+/gtk/gtkhbbox.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkhbbox.c	2007-06-27 15:25:43 UTC (rev 12518)
+++ projects/haf/trunk/gtk+/gtk/gtkhbbox.c	2007-06-27 16:11:01 UTC (rev 12519)
@@ -242,8 +242,7 @@
       (allocation->width
        - (child_width * (nvis_children - n_secondaries)
 	  + spacing * (nvis_children - n_secondaries - 1)))/2
-      + (n_secondaries * child_width + n_secondaries * spacing)/2
-      - GTK_CONTAINER (box)->border_width;
+      + (n_secondaries * child_width + n_secondaries * spacing)/2;
     secondary_x = allocation->x + GTK_CONTAINER (box)->border_width;
     break;
   default:

Modified: projects/haf/trunk/gtk+/gtk/gtkvbbox.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkvbbox.c	2007-06-27 15:25:43 UTC (rev 12518)
+++ projects/haf/trunk/gtk+/gtk/gtkvbbox.c	2007-06-27 16:11:01 UTC (rev 12519)
@@ -246,8 +246,7 @@
       (allocation->height
        - (child_height * (nvis_children - n_secondaries)
 	  + spacing * (nvis_children - n_secondaries - 1)))/2
-      + (n_secondaries * child_height + n_secondaries * spacing)/2
-      - GTK_CONTAINER (box)->border_width;
+      + (n_secondaries * child_height + n_secondaries * spacing)/2;
     secondary_y = allocation->y + GTK_CONTAINER (box)->border_width;
     break;
   default: