icon view: Use a fixed vertical spacing in the normal icon view.

This greatly reduces the amount of processing involved in loading
large folders.

Author: mtwebster

libnemo-private/nemo-icon-canvas-item.c

@@ -2022,6 +2022,25 @@ nemo_icon_canvas_item_set_entire_text (NemoIconCanvasItem       *item,
 	}
 }
 
+gint
+nemo_icon_canvas_item_get_fixed_text_height_for_layout (NemoIconCanvasItem *item)
+{
+    NemoIconContainer *container;
+    PangoLayout *layout;
+    gint line_height, total_height, lines;
+
+    container = NEMO_ICON_CONTAINER (EEL_CANVAS_ITEM (item)->canvas);
+    lines = nemo_icon_container_get_max_layout_lines (container);
+    lines += nemo_icon_container_get_additional_text_line_count (container);
+    layout = create_label_layout (item, "-");
+    pango_layout_get_pixel_size (layout, NULL, &line_height);
+
+    total_height = (line_height * lines) + (LABEL_LINE_SPACING * (lines - 1));
+    g_object_unref (layout);
+
+    return total_height;
+}
+
 /* Class initialization function for the icon canvas item. */
 static void
 nemo_icon_canvas_item_class_init (NemoIconCanvasItemClass *class)

libnemo-private/nemo-icon-canvas-item.h

@@ -104,7 +104,7 @@ void        nemo_icon_canvas_item_set_is_visible           (NemoIconCanvasItem
 /* whether the entire label text must be visible at all times */
 void        nemo_icon_canvas_item_set_entire_text          (NemoIconCanvasItem       *icon_item,
 								gboolean                      entire_text);
-
+gint        nemo_icon_canvas_item_get_fixed_text_height_for_layout (NemoIconCanvasItem *item);
 G_END_DECLS
 
 #endif /* NEMO_ICON_CANVAS_ITEM_H */

libnemo-private/nemo-icon-container.c

@@ -4903,6 +4903,8 @@ nemo_icon_container_init (NemoIconContainer *container)
 	details->font_size_table[NEMO_ZOOM_LEVEL_LARGER] = 0 * PANGO_SCALE;
 	details->font_size_table[NEMO_ZOOM_LEVEL_LARGEST] = 0 * PANGO_SCALE;
 
+    details->fixed_text_height = -1;
+
     details->view_constants = g_slice_new0 (NemoViewLayoutConstants);
 
 	container->details = details;
@@ -5828,6 +5830,8 @@ nemo_icon_container_invalidate_labels (NemoIconContainer *container)
     GList *p;
     NemoIcon *icon;
 
+    container->details->fixed_text_height = -1;
+
     for (p = container->details->icons; p != NULL; p = p->next) {
         icon = p->data;
 
@@ -8096,4 +8100,10 @@ nemo_icon_container_update_icon (NemoIconContainer *container,
     NEMO_ICON_CONTAINER_GET_CLASS (container)->update_icon (container, icon);
 }
 
+gint
+nemo_icon_container_get_additional_text_line_count (NemoIconContainer *container)
+{
+    return NEMO_ICON_CONTAINER_GET_CLASS (container)->get_additional_text_line_count (container);
+}
+
 #endif /* ! NEMO_OMIT_SELF_CHECK */

libnemo-private/nemo-icon-container.h

@@ -163,6 +163,7 @@ typedef struct {
 						   NemoIconData *data);
     gint         (* get_max_layout_lines_for_pango) (NemoIconContainer *container);
     gint         (* get_max_layout_lines)           (NemoIconContainer *container);
+    gint         (* get_additional_text_line_count) (NemoIconContainer *container);
 
 	/* Queries on icons for subclass/client.
 	 * These must be implemented => These are signals !
@@ -371,4 +372,5 @@ void              nemo_icon_container_widget_to_file_operation_position (NemoIco
 void         nemo_icon_container_setup_tooltip_preference_callback (NemoIconContainer *container);
 void         nemo_icon_container_update_tooltip_text (NemoIconContainer  *container,
                                                       NemoIconCanvasItem *item);
+gint         nemo_icon_container_get_additional_text_line_count (NemoIconContainer *container);
 #endif /* NEMO_ICON_CONTAINER_H */

libnemo-private/nemo-icon-private.h

@@ -302,6 +302,7 @@ struct NemoIconContainerDetails {
 
     GList *current_selection;
     gint current_selection_count;
+    gint fixed_text_height;
 };
 
 typedef struct {

src/nemo-icon-view-container.c

@@ -720,8 +720,6 @@ lay_down_icons_horizontal (NemoIconContainer *container,
     EelDRect bounds;
     EelDRect icon_bounds;
     EelDRect text_bounds;
-    double max_height_above, max_height_below;
-    double height_above, height_below;
     double line_width;
     double grid_width;
     double max_text_width, max_icon_width;
@@ -755,7 +753,7 @@ lay_down_icons_horizontal (NemoIconContainer *container,
     text_size = nemo_get_icon_text_width_for_zoom_level (container->details->zoom_level);
 
     use_size = MAX (icon_size, text_size) + 15;
-
+    icon_size /= ppu;
     if (container->details->label_position == NEMO_ICON_LABEL_POSITION_BESIDE) {
         /* Would it be worth caching these bounds for the next loop? */
         for (p = icons; p != NULL; p = p->next) {
@@ -782,54 +780,42 @@ lay_down_icons_horizontal (NemoIconContainer *container,
     y = start_y + gap;
     i = 0;
 
-    max_height_above = 0;
-    max_height_below = 0;
     for (p = icons; p != NULL; p = p->next) {
         icon = p->data;
 
+        if (container->details->fixed_text_height == -1) {
+            container->details->fixed_text_height = nemo_icon_canvas_item_get_fixed_text_height_for_layout (icon->item) / ppu;
+        }
+
         /* Assume it's only one level hierarchy to avoid costly affine calculations */
         nemo_icon_canvas_item_get_bounds_for_layout (icon->item,
                                  &bounds.x0, &bounds.y0,
                                  &bounds.x1, &bounds.y1);
 
         icon_bounds = nemo_icon_canvas_item_get_icon_rectangle (icon->item);
-
         icon_width = grid_width;
-        /* Calculate size above/below baseline */
-        height_above = icon_bounds.y1 - bounds.y0;
-        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 (container->details->label_position == NEMO_ICON_LABEL_POSITION_BESIDE) {
                 y += gap;
             } else {
                 /* Advance to the baseline. */
-                y += gap + max_height_above;
+                y += gap + icon_size;
             }
 
-            lay_down_one_line (container, line_start, p, y, max_height_above, positions, FALSE, gap);
+            lay_down_one_line (container, line_start, p, y, icon_size, positions, FALSE, gap);
 
             if (container->details->label_position == NEMO_ICON_LABEL_POSITION_BESIDE) {
-                y += max_height_above + max_height_below + gap;
+                y += gap + icon_size;
             } else {
                 /* Advance to next line. */
-                y += max_height_below + gap;
+                y += container->details->fixed_text_height + gap;
             }
 
             line_width = container->details->label_position == NEMO_ICON_LABEL_POSITION_BESIDE ? gap : 0;
             line_start = p;
             i = 0;
-
-            max_height_above = height_above;
-            max_height_below = height_below;
-        } else {
-            if (height_above > max_height_above) {
-                max_height_above = height_above;
-            }
-            if (height_below > max_height_below) {
-                max_height_below = height_below;
-            }
         }
 
         g_array_set_size (positions, i + 1);
@@ -855,10 +841,10 @@ lay_down_icons_horizontal (NemoIconContainer *container,
                 y += gap;
             } else {
                 /* Advance to the baseline. */
-                y += gap + max_height_above;
+                y += gap + icon_size;
             }
 
-        lay_down_one_line (container, line_start, NULL, y, max_height_above, positions, TRUE, gap);
+        lay_down_one_line (container, line_start, NULL, y, icon_size, positions, TRUE, gap);
     }
 
     g_array_free (positions, TRUE);
@@ -2041,12 +2027,23 @@ nemo_icon_view_container_get_max_layout_lines (NemoIconContainer  *container)
     }
 
     if (limit <= 0) {
-        return G_MAXINT;
+        return 3;
     }
 
     return limit;
 }
 
+static gint
+nemo_icon_view_container_get_additional_text_line_count (NemoIconContainer *container)
+{
+    G_GNUC_UNUSED GQuark *attributes;
+    gint len;
+
+    attributes = nemo_icon_view_container_get_icon_text_attribute_names (container, &len);
+
+    return len;
+}
+
 static void
 finalize (GObject *object)
 {
@@ -2096,6 +2093,7 @@ nemo_icon_view_container_class_init (NemoIconViewContainerClass *klass)
     ic_class->finish_adding_new_icons = nemo_icon_view_container_finish_adding_new_icons;
     ic_class->icon_get_bounding_box = nemo_icon_view_container_icon_get_bounding_box;
     ic_class->set_zoom_level = nemo_icon_view_container_set_zoom_level;
+    ic_class->get_additional_text_line_count = nemo_icon_view_container_get_additional_text_line_count;
 }
 
 static void

src/nemo-icon-view-grid-container.c

@@ -1545,6 +1545,12 @@ nemo_icon_view_grid_container_get_max_layout_lines (NemoIconContainer  *containe
     return limit;
 }
 
+static gint
+nemo_icon_view_grid_container_get_additional_text_line_count (NemoIconContainer *container)
+{
+    return quarkv_length (NEMO_ICON_VIEW_GRID_CONTAINER (container)->attributes);
+}
+
 static void
 captions_changed_callback (NemoIconContainer *container)
 {
@@ -1672,6 +1678,7 @@ nemo_icon_view_grid_container_class_init (NemoIconViewGridContainerClass *klass)
 	ic_class->prioritize_thumbnailing = nemo_icon_view_grid_container_prioritize_thumbnailing;
     ic_class->get_max_layout_lines_for_pango = nemo_icon_view_grid_container_get_max_layout_lines_for_pango;
     ic_class->get_max_layout_lines = nemo_icon_view_grid_container_get_max_layout_lines;
+    ic_class->get_additional_text_line_count = nemo_icon_view_grid_container_get_additional_text_line_count;
 
 	ic_class->compare_icons = nemo_icon_view_grid_container_compare_icons;
 	ic_class->freeze_updates = nemo_icon_view_grid_container_freeze_updates;