nautilus r14025 - in trunk: . libnautilus-private

[cneumair svn gnome org]

Author: cneumair
Date: Wed Apr  2 12:26:50 2008
New Revision: 14025
URL: http://svn.gnome.org/viewvc/nautilus?rev=14025&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), (get_max_icon_dimensions),
	(lay_down_icons_vertical),
	(nautilus_icon_container_start_renaming_selected_item),
	(nautilus_icon_container_is_layout_vertical):
	* libnautilus-private/nautilus-icon-container.h:
	* src/nautilus-window.c
	(nautilus_window_set_initial_window_geometry):
	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.

	Add container padding on the RHS for vertical layout, and consider
	max. emblem rectangles when deciding whether to wrap. This may wrap
	slightly to early in some (high zoom level) situations, but we will
	never get scroll glitches.


Modified:
   trunk/ChangeLog
   trunk/libnautilus-private/nautilus-icon-container.c
   trunk/libnautilus-private/nautilus-icon-container.h

Modified: trunk/libnautilus-private/nautilus-icon-container.c
==============================================================================
--- trunk/libnautilus-private/nautilus-icon-container.c	(original)
+++ trunk/libnautilus-private/nautilus-icon-container.c	Wed Apr  2 12:26:50 2008
@@ -97,6 +97,7 @@
 #define ICON_PAD_BOTTOM 4
 
 #define CONTAINER_PAD_LEFT 4
+#define CONTAINER_PAD_RIGHT 4
 #define CONTAINER_PAD_TOP 4
 #define CONTAINER_PAD_BOTTOM 4
 
@@ -867,7 +868,19 @@
 		y1 -= CONTAINER_PAD_TOP;
 	}
 
-	y2 += CONTAINER_PAD_BOTTOM;
+	x2 -= 1;
+	y2 -= 1;
+
+	/* for horizontal layouts, we add a bottom border.
+	 *
+	 * vertical layout is used by the compact view,
+	 * which does not need a bottom border.
+	 */
+	if (nautilus_icon_container_is_layout_vertical (container)) {
+		x2 += CONTAINER_PAD_RIGHT;
+	} else {
+		y2 += CONTAINER_PAD_BOTTOM;
+	}
 
 	if (reset_scroll_region) {
 		eel_canvas_set_scroll_region
@@ -1124,7 +1137,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 {
@@ -1201,15 +1214,18 @@
 			 double *max_icon_width,
 			 double *max_icon_height,
 			 double *max_text_width,
-			 double *max_text_height)
+			 double *max_text_height,
+			 double *max_bounds_height)
 {
 	NautilusIcon *icon;
 	EelDRect icon_bounds;
 	EelDRect text_bounds;
 	GList *p;
+	double y1, y2;
 
 	*max_icon_width = *max_text_width = 0.0;
 	*max_icon_height = *max_text_height = 0.0;
+	*max_bounds_height = 0.0;
 
 	/* Would it be worth caching these bounds for the next loop? */
 	for (p = icon_start; p != icon_end; p = p->next) {
@@ -1222,6 +1238,9 @@
 		text_bounds = nautilus_icon_canvas_item_get_text_rectangle (icon->item);
 		*max_text_width = MAX (*max_text_width, ceil (text_bounds.x1 - text_bounds.x0));
 		*max_text_height = MAX (*max_text_height, ceil (text_bounds.y1 - text_bounds.y0));
+
+		eel_canvas_item_get_bounds (EEL_CANVAS_ITEM (icon->item), NULL, &y1, NULL, &y2);
+		*max_bounds_height = MAX (*max_bounds_height, y2 - y1);
 	}
 }
 
@@ -1247,6 +1266,9 @@
 	double max_width;
 	double max_width_in_column;
 
+	double max_bounds_height;
+	double max_bounds_height_with_borders;
+
 	double max_text_width, max_icon_width;
 	double max_text_height, max_icon_height;
 	int height;
@@ -1267,15 +1289,19 @@
 
 	max_icon_width = max_text_width = 0.0;
 	max_icon_height = max_text_height = 0.0;
+	max_bounds_height = 0.0;
 
 	get_max_icon_dimensions (icons, NULL,
 				 &max_icon_width, &max_icon_height,
-				 &max_text_width, &max_text_height);
+				 &max_text_width, &max_text_height,
+				 &max_bounds_height);
 
 	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;
 
+	max_bounds_height_with_borders = ICON_PAD_TOP + max_bounds_height;
+
 	line_height = ICON_PAD_TOP;
 	line_start = icons;
 	x = 0;
@@ -1288,7 +1314,13 @@
 		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 > canvas_height ) {
+
+		/* We use the bounds height here, since for wrapping we also want to consider
+		 * overlapping emblems at the bottom. We may wrap a little bit too early since
+		 * the icon with the max. bounds height may actually not be in the last row, but
+		 * it is better than visual glitches
+		 */
+		if (line_start != p && line_height + (max_bounds_height_with_borders-1) >= canvas_height ) {
 			x += ICON_PAD_LEFT;
 
 			/* correctly set (per-column) width */
@@ -7254,9 +7286,8 @@
 	icon_rect = nautilus_icon_canvas_item_get_icon_rectangle (icon->item);
 	text_rect = nautilus_icon_canvas_item_get_text_rectangle (icon->item);
 
-	if ((container->details->layout_mode == NAUTILUS_ICON_LAYOUT_T_B_L_R ||
-	     container->details->layout_mode == NAUTILUS_ICON_LAYOUT_T_B_R_L) &&
-	     container->details->label_position == NAUTILUS_ICON_LABEL_POSITION_BESIDE) {
+	if (nautilus_icon_container_is_layout_vertical (container) &&
+	    container->details->label_position == NAUTILUS_ICON_LABEL_POSITION_BESIDE) {
 		/* for one-line editables, the width changes dynamically */
 		width = -1;
 	} else {
@@ -8454,4 +8485,14 @@
 		container->details->layout_mode == NAUTILUS_ICON_LAYOUT_R_L_T_B;
 }
 
+gboolean
+nautilus_icon_container_is_layout_vertical (NautilusIconContainer *container)
+{
+	g_return_val_if_fail (NAUTILUS_IS_ICON_CONTAINER (container), FALSE);
+
+	return (container->details->layout_mode == NAUTILUS_ICON_LAYOUT_T_B_L_R ||
+		container->details->layout_mode == NAUTILUS_ICON_LAYOUT_T_B_R_L);
+}
+
+
 #endif /* ! NAUTILUS_OMIT_SELF_CHECK */

Modified: trunk/libnautilus-private/nautilus-icon-container.h
==============================================================================
--- trunk/libnautilus-private/nautilus-icon-container.h	(original)
+++ trunk/libnautilus-private/nautilus-icon-container.h	Wed Apr  2 12:26:50 2008
@@ -308,6 +308,7 @@
 									 gboolean                all_columns_same_width);
 
 gboolean	  nautilus_icon_container_is_layout_rtl			(NautilusIconContainer  *container);
+gboolean	  nautilus_icon_container_is_layout_vertical		(NautilusIconContainer  *container);
 
 void              nautilus_icon_container_widget_to_file_operation_position (NautilusIconContainer *container,
 									     GdkPoint              *position);