[gtk+/icon-view-refactor: 10/12] Made GtkIconView reset the context and invalidate all sizes when a row changes.

[Tristan Van Berkom <tvb src gnome org>]

commit a1463b548a4c4679b04c444503ee501592d8489c
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Mon Dec 13 18:08:37 2010 +0900

    Made GtkIconView reset the context and invalidate all sizes when a row changes.
    
    GtkIconView should have a "grow-only" mode to handle optimization to
    only allow icons to grow in width when rows change, however since
    GtkIconView still does not handle large numbers of rows for now we'll
    just relayout the whole thing whenever a series of rows change.
    
    Also fixed up to watch the context incase of implicit resets.

 gtk/gtkiconview.c |   60 +++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 47 insertions(+), 13 deletions(-)
---
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 6e350cb..1190b9f 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -386,6 +386,9 @@ static void                 gtk_icon_view_remove_editable                (GtkCel
 									  GtkCellRenderer        *renderer,
 									  GtkCellEditable        *editable,
 									  GtkIconView            *icon_view);
+static void                 gtk_icon_view_context_changed                (GtkCellAreaContext     *context,
+									  GParamSpec             *pspec,
+									  GtkIconView            *icon_view);
 
 /* Source side drag signals */
 static void gtk_icon_view_drag_begin       (GtkWidget        *widget,
@@ -1126,6 +1129,9 @@ gtk_icon_view_constructor (GType               type,
   priv->remove_editable_id = 
     g_signal_connect (priv->cell_area, "remove-editable", 
 		      G_CALLBACK (gtk_icon_view_remove_editable), icon_view);
+  priv->context_changed_id = 
+    g_signal_connect (priv->cell_area_context, "notify", 
+		      G_CALLBACK (gtk_icon_view_context_changed), icon_view);
 
   return object;
 }
@@ -1141,6 +1147,9 @@ gtk_icon_view_dispose (GObject *object)
 
   if (priv->cell_area_context)
     {
+      g_signal_handler_disconnect (priv->cell_area_context, priv->context_changed_id);
+      priv->context_changed_id = 0;
+
       g_object_unref (priv->cell_area_context);
       priv->cell_area_context = NULL;
     }
@@ -1165,7 +1174,6 @@ gtk_icon_view_dispose (GObject *object)
   G_OBJECT_CLASS (gtk_icon_view_parent_class)->dispose (object);
 }
 
-
 static void
 gtk_icon_view_set_property (GObject      *object,
 			    guint         prop_id,
@@ -1856,6 +1864,18 @@ gtk_icon_view_remove_editable (GtkCellArea            *area,
   gtk_tree_path_free (path);
 }
 
+static void
+gtk_icon_view_context_changed (GtkCellAreaContext     *context,
+			       GParamSpec             *pspec,
+			       GtkIconView            *icon_view)
+{
+  if (!strcmp (pspec->name, "minimum-width") ||
+      !strcmp (pspec->name, "natural-width") ||
+      !strcmp (pspec->name, "minimum-height") ||
+      !strcmp (pspec->name, "natural-height"))
+    gtk_icon_view_invalidate_sizes (icon_view);
+}
+
 /**
  * gtk_icon_view_set_cursor:
  * @icon_view: A #GtkIconView
@@ -2854,6 +2874,9 @@ gtk_icon_view_cache_widths (GtkIconView *icon_view)
 {
   GList *items;
 
+  g_signal_handler_block (icon_view->priv->cell_area_context, 
+			  icon_view->priv->context_changed_id);
+
   for (items = icon_view->priv->items; items; items = items->next)
     {
       GtkIconViewItem *item = items->data;
@@ -2867,13 +2890,27 @@ gtk_icon_view_cache_widths (GtkIconView *icon_view)
 					     GTK_WIDGET (icon_view), NULL, NULL);
 	}
     }
+
+  g_signal_handler_unblock (icon_view->priv->cell_area_context, 
+			    icon_view->priv->context_changed_id);
 }
 
 static void
 gtk_icon_view_invalidate_sizes (GtkIconView *icon_view)
 {
+  /* Clear all item sizes */
   g_list_foreach (icon_view->priv->items,
 		  (GFunc)gtk_icon_view_item_invalidate_size, NULL);
+
+  /* Reset the context */
+  g_signal_handler_block (icon_view->priv->cell_area_context, 
+			  icon_view->priv->context_changed_id);
+  gtk_cell_area_context_reset (icon_view->priv->cell_area_context);
+  g_signal_handler_unblock (icon_view->priv->cell_area_context, 
+			    icon_view->priv->context_changed_id);
+
+  /* Re-layout the items */
+  gtk_icon_view_queue_layout (icon_view);
 }
 
 static void
@@ -3246,8 +3283,15 @@ gtk_icon_view_row_changed (GtkTreeModel *model,
   index = gtk_tree_path_get_indices(path)[0];
   item = g_list_nth_data (icon_view->priv->items, index);
 
-  gtk_icon_view_item_invalidate_size (item);
-  gtk_icon_view_queue_layout (icon_view);
+  /* Here we can use a "grow-only" strategy for optimization
+   * and only invalidate a single item and queue a relayout 
+   * instead of invalidating the whole thing. 
+   *
+   * For now GtkIconView still cant deal with huge models
+   * so just invalidate the whole thing when the model 
+   * changes.
+   */
+  gtk_icon_view_invalidate_sizes (icon_view);
 
   verify_items (icon_view);
 }
@@ -4939,7 +4983,6 @@ gtk_icon_view_set_text_column (GtkIconView *icon_view,
   update_text_cell (icon_view);
 
   gtk_icon_view_invalidate_sizes (icon_view);
-  gtk_icon_view_queue_layout (icon_view);
   
   g_object_notify (G_OBJECT (icon_view), "text-column");
 }
@@ -5002,7 +5045,6 @@ gtk_icon_view_set_markup_column (GtkIconView *icon_view,
   update_text_cell (icon_view);
 
   gtk_icon_view_invalidate_sizes (icon_view);
-  gtk_icon_view_queue_layout (icon_view);
   
   g_object_notify (G_OBJECT (icon_view), "markup-column");
 }
@@ -5063,7 +5105,6 @@ gtk_icon_view_set_pixbuf_column (GtkIconView *icon_view,
   update_pixbuf_cell (icon_view);
 
   gtk_icon_view_invalidate_sizes (icon_view);
-  gtk_icon_view_queue_layout (icon_view);
   
   g_object_notify (G_OBJECT (icon_view), "pixbuf-column");
   
@@ -5382,7 +5423,6 @@ gtk_icon_view_set_item_orientation (GtkIconView    *icon_view,
 
       gtk_cell_area_stop_editing (icon_view->priv->cell_area, TRUE);
       gtk_icon_view_invalidate_sizes (icon_view);
-      gtk_icon_view_queue_layout (icon_view);
 
       update_text_cell (icon_view);
       update_pixbuf_cell (icon_view);
@@ -5481,7 +5521,6 @@ gtk_icon_view_set_item_width (GtkIconView *icon_view,
       
       gtk_cell_area_stop_editing (icon_view->priv->cell_area, TRUE);
       gtk_icon_view_invalidate_sizes (icon_view);
-      gtk_icon_view_queue_layout (icon_view);
       
       update_text_cell (icon_view);
 
@@ -5531,7 +5570,6 @@ gtk_icon_view_set_spacing (GtkIconView *icon_view,
 
       gtk_cell_area_stop_editing (icon_view->priv->cell_area, TRUE);
       gtk_icon_view_invalidate_sizes (icon_view);
-      gtk_icon_view_queue_layout (icon_view);
       
       g_object_notify (G_OBJECT (icon_view), "spacing");
     }  
@@ -5577,7 +5615,6 @@ gtk_icon_view_set_row_spacing (GtkIconView *icon_view,
 
       gtk_cell_area_stop_editing (icon_view->priv->cell_area, TRUE);
       gtk_icon_view_invalidate_sizes (icon_view);
-      gtk_icon_view_queue_layout (icon_view);
       
       g_object_notify (G_OBJECT (icon_view), "row-spacing");
     }  
@@ -5623,7 +5660,6 @@ gtk_icon_view_set_column_spacing (GtkIconView *icon_view,
 
       gtk_cell_area_stop_editing (icon_view->priv->cell_area, TRUE);
       gtk_icon_view_invalidate_sizes (icon_view);
-      gtk_icon_view_queue_layout (icon_view);
       
       g_object_notify (G_OBJECT (icon_view), "column-spacing");
     }  
@@ -5670,7 +5706,6 @@ gtk_icon_view_set_margin (GtkIconView *icon_view,
 
       gtk_cell_area_stop_editing (icon_view->priv->cell_area, TRUE);
       gtk_icon_view_invalidate_sizes (icon_view);
-      gtk_icon_view_queue_layout (icon_view);
       
       g_object_notify (G_OBJECT (icon_view), "margin");
     }  
@@ -5716,7 +5751,6 @@ gtk_icon_view_set_item_padding (GtkIconView *icon_view,
 
       gtk_cell_area_stop_editing (icon_view->priv->cell_area, TRUE);
       gtk_icon_view_invalidate_sizes (icon_view);
-      gtk_icon_view_queue_layout (icon_view);
       
       g_object_notify (G_OBJECT (icon_view), "item-padding");
     }