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

[From: subversion at stage.maemo.org]

Author: tko
Date: 2007-09-18 16:36:27 +0300 (Tue, 18 Sep 2007)
New Revision: 13898

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkhbbox.c
Log:
Fix spacings in GTK_BUTTONBOX_EDGE case which got broken by NB#63578.

2007-09-18  Tommi Komulainen  <tommi.komulainen at nokia.com>

	* gtk/gtkhbbox.c (gtk_hbutton_box_size_allocate): Fix spacings in
	GTK_BUTTONBOX_EDGE case which got broken by NB#63578.


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-09-18 13:33:51 UTC (rev 13897)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-09-18 13:36:27 UTC (rev 13898)
@@ -1,5 +1,10 @@
 2007-09-18  Tommi Komulainen  <tommi.komulainen at nokia.com>
 
+	* gtk/gtkhbbox.c (gtk_hbutton_box_size_allocate): Fix spacings in
+	GTK_BUTTONBOX_EDGE case which got broken by NB#63578.
+
+2007-09-18  Tommi Komulainen  <tommi.komulainen at nokia.com>
+
 	* gtk/gtkhbbox.c (gtk_hbutton_box_get_children_sizes): Remember to
 	return the array.
 

Modified: projects/haf/trunk/gtk+/gtk/gtkhbbox.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkhbbox.c	2007-09-18 13:33:51 UTC (rev 13897)
+++ projects/haf/trunk/gtk+/gtk/gtkhbbox.c	2007-09-18 13:36:27 UTC (rev 13898)
@@ -335,7 +335,7 @@
       if (nvis_children >= 2)
         {
           childspacing = (inner_width
-                          - (primary_width + secondary_width)) / (nvis_children + 1);
+                          - (primary_width + secondary_width)) / (nvis_children - 1);
           x = allocation->x + GTK_CONTAINER (widget)->border_width;
           secondary_x = x + primary_width + primary_spacing + childspacing;
         }