nautilus r14026 - in branches/gnome-2-22: . libnautilus-private

[cneumair svn gnome org]

Author: cneumair
Date: Wed Apr  2 12:27:14 2008
New Revision: 14026
URL: http://svn.gnome.org/viewvc/nautilus?rev=14026&view=rev

Log:
2008-04-02  Christian Neumair  <cneumair gnome org>

	* libnautilus-private/nautilus-icon-container.c
	(nautilus_icon_container_update_scroll_region),
	(lay_down_icons_horizontal):
	Subtract 1 from icon rectangle's x2/y2 positions before setting scroll
	area since the entire canvas codes requests 1 px more than it needs.
	Wrap when the icon hits the canvas, rather than wrapping to late.
	Fixes most of the "text besides icons" glitches.


Modified:
   branches/gnome-2-22/ChangeLog
   branches/gnome-2-22/libnautilus-private/nautilus-icon-container.c

Modified: branches/gnome-2-22/libnautilus-private/nautilus-icon-container.c
==============================================================================
--- branches/gnome-2-22/libnautilus-private/nautilus-icon-container.c	(original)
+++ branches/gnome-2-22/libnautilus-private/nautilus-icon-container.c	Wed Apr  2 12:27:14 2008
@@ -867,6 +867,9 @@
 		y1 -= CONTAINER_PAD_TOP;
 	}
 
+	x2 -= 1;
+	y2 -= 1;
+
 	y2 += CONTAINER_PAD_BOTTOM;
 
 	if (reset_scroll_region) {
@@ -1090,7 +1093,7 @@
 		height_below = bounds.y1 - icon_bounds.y1;
 
 		/* If this icon doesn't fit, it's time to lay out the line that's queued up. */
-		if (line_start != p && line_width + icon_width > canvas_width ) {
+		if (line_start != p && line_width + icon_width >= canvas_width ) {
 			if (container->details->label_position == NAUTILUS_ICON_LABEL_POSITION_BESIDE) {
 				y += ICON_PAD_TOP;
 			} else {