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

[cneumair svn gnome org]

Author: cneumair
Date: Thu Apr  3 17:11:05 2008
New Revision: 14029
URL: http://svn.gnome.org/viewvc/nautilus?rev=14029&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/y2. Fixes flashing scrollbar
	for empty container.


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	Thu Apr  3 17:11:05 2008
@@ -868,7 +868,10 @@
 	}
 
 	x2 -= 1;
+	x2 = MAX (x1, x2);
+
 	y2 -= 1;
+	x2 = MAX (y1, y2);
 
 	y2 += CONTAINER_PAD_BOTTOM;