nautilus r15184 - in trunk: . libnautilus-private

[alexl svn gnome org]

Author: alexl
Date: Thu Apr 16 08:34:19 2009
New Revision: 15184
URL: http://svn.gnome.org/viewvc/nautilus?rev=15184&view=rev

Log:
2009-04-16  Alexander Larsson  <alexl redhat com>

	Bug 579086 â Excessive white-space on right-hand side in icon view
	
	* libnautilus-private/nautilus-icon-container.c:
	(nautilus_icon_container_update_scroll_region):
	When using at allocation->width, take zoom into account



Modified:
   trunk/ChangeLog
   trunk/libnautilus-private/nautilus-icon-container.c

Modified: trunk/libnautilus-private/nautilus-icon-container.c
==============================================================================
--- trunk/libnautilus-private/nautilus-icon-container.c	(original)
+++ trunk/libnautilus-private/nautilus-icon-container.c	Thu Apr 16 08:34:19 2009
@@ -1033,9 +1033,9 @@
 	GtkAllocation *allocation;
 	gboolean reset_scroll_region;
 
-	if (nautilus_icon_container_get_is_fixed_size (container)) {
-		pixels_per_unit = EEL_CANVAS (container)->pixels_per_unit;
+	pixels_per_unit = EEL_CANVAS (container)->pixels_per_unit;
 
+	if (nautilus_icon_container_get_is_fixed_size (container)) {
 		/* Set the scroll region to the size of the container allocation */
 		allocation = &GTK_WIDGET (container)->allocation;
 		eel_canvas_set_scroll_region
@@ -1090,7 +1090,7 @@
 	if (nautilus_icon_container_is_auto_layout (container)) {
 		allocation = &GTK_WIDGET (container)->allocation;
 		x1 = MIN (x1, 0);
-		x2 = MAX (x2, allocation->width);
+		x2 = MAX (x2, allocation->width / pixels_per_unit);
 		y1 = 0;
 	} else {
 		/* Otherwise we add the padding that is at the start of the