nautilus r14031 - in trunk: . libnautilus-private

[cneumair svn gnome org]

Author: cneumair
Date: Thu Apr  3 17:14:06 2008
New Revision: 14031
URL: http://svn.gnome.org/viewvc/nautilus?rev=14031&view=rev

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

	* libnautilus-private/nautilus-icon-container.c
	(nautilus_icon_container_update_scroll_region):
	Do not make x2/y2 smaller than x1/y1. Fixes flashing scrollbar
	for empty container.


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  3 17:14:06 2008
@@ -869,7 +869,10 @@
 	}
 
 	x2 -= 1;
+	x2 = MAX(x1, x2);
+
 	y2 -= 1;
+	y2 = MAX(y1, y2);
 
 	/* for horizontal layouts, we add a bottom border.
 	 *