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

[From: subversion at stage.maemo.org]

Author: xan
Date: 2007-06-25 15:10:24 +0300 (Mon, 25 Jun 2007)
New Revision: 12443

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

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

	Need to rest the container border_width, not add, since the logic uses
	the full allocation width including the border width.


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-06-25 09:04:47 UTC (rev 12442)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-06-25 12:10:24 UTC (rev 12443)
@@ -1,5 +1,13 @@
 2007-06-25  Xan Lopez  <xan.lopez at nokia.com>
 
+	* gtk/gtkhbbox.c (gtk_hbutton_box_size_allocate):
+	* gtk/gtkvbbox.c (gtk_vbutton_box_size_allocate): 
+
+	Need to rest the container border_width, not add, since the logic uses
+	the full allocation width including the border width.
+
+2007-06-25  Xan Lopez  <xan.lopez at nokia.com>
+	
 	* gdk/x11/gdkinput-x11.c (gdk_input_translate_coordinates): protect maemo changes with
 	MAEMO_CHANGES.
 

Modified: projects/haf/trunk/gtk+/gtk/gtkhbbox.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkhbbox.c	2007-06-25 09:04:47 UTC (rev 12442)
+++ projects/haf/trunk/gtk+/gtk/gtkhbbox.c	2007-06-25 12:10:24 UTC (rev 12443)
@@ -243,7 +243,7 @@
        - (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;
+      - GTK_CONTAINER (box)->border_width;
     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-25 09:04:47 UTC (rev 12442)
+++ projects/haf/trunk/gtk+/gtk/gtkvbbox.c	2007-06-25 12:10:24 UTC (rev 12443)
@@ -247,7 +247,7 @@
        - (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;
+      - GTK_CONTAINER (box)->border_width;
     secondary_y = allocation->y + GTK_CONTAINER (box)->border_width;
     break;
   default: