nautilus r14012 - in trunk: . libnautilus-private

[cneumair svn gnome org]

Author: cneumair
Date: Mon Mar 31 14:00:36 2008
New Revision: 14012
URL: http://svn.gnome.org/viewvc/nautilus?rev=14012&view=rev

Log:
2008-03-31  Christian Neumair  <cneumair gnome org>

	* libnautilus-private/nautilus-icon-container.c
	(lay_down_icons_vertical):
	Reduce vertical space between icons, do not request space at the
	bottom of a column.


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	Mon Mar 31 14:00:36 2008
@@ -1274,7 +1274,7 @@
 
 	max_width = max_icon_width + max_text_width;
 	max_height = MAX (max_icon_height, max_text_height);
-	max_height_with_borders = ICON_PAD_TOP + max_height + ICON_PAD_BOTTOM;
+	max_height_with_borders = ICON_PAD_TOP + max_height;
 
 	line_height = ICON_PAD_TOP;
 	line_start = icons;
@@ -1288,7 +1288,7 @@
 		item = EEL_CANVAS_ITEM (icon->item);
 
 		/* If this icon doesn't fit, it's time to lay out the column that's queued up. */
-		if (line_start != p && line_height + max_height_with_borders + ICON_PAD_BOTTOM > canvas_height ) {
+		if (line_start != p && line_height + max_height_with_borders > canvas_height ) {
 			x += ICON_PAD_LEFT;
 
 			/* correctly set (per-column) width */