nautilus r14857 - in trunk: . libnautilus-private

[alexl svn gnome org]

Author: alexl
Date: Tue Jan 13 15:48:37 2009
New Revision: 14857
URL: http://svn.gnome.org/viewvc/nautilus?rev=14857&view=rev

Log:
2009-01-13  Alexander Larsson  <alexl redhat com>

        * libnautilus-private/nautilus-icon-container.c:
        (get_icon_bounds_for_canvas_bounds):
	When calculating bounds, don't ignore visible but unmapped items, becase
	the root item is unmapped with the canvas, but we want to report the
	same bounds independently on the canvas mapped state.
	This caused problems when the canvas was unmapped due to being on an
	invisible notebook page navigation tabs case, causing the
	scrollbars to become invisible. (#542396)



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	Tue Jan 13 15:48:37 2009
@@ -888,7 +888,7 @@
 	for (list = group->item_list; list; list = list->next) {
 		child = list->data;
 
-		if (child->object.flags & EEL_CANVAS_ITEM_MAPPED) {
+		if (child->object.flags & EEL_CANVAS_ITEM_VISIBLE) {
 			set = TRUE;
 			if (!NAUTILUS_IS_ICON_CANVAS_ITEM (child) ||
 			    usage == BOUNDS_USAGE_FOR_DISPLAY) {
@@ -920,7 +920,7 @@
 	for (; list; list = list->next) {
 		child = list->data;
 
-		if (!(child->object.flags & EEL_CANVAS_ITEM_MAPPED))
+		if (!(child->object.flags & EEL_CANVAS_ITEM_VISIBLE))
 			continue;
 
 		if (!NAUTILUS_IS_ICON_CANVAS_ITEM (child) ||