Queue a resize when the model is unset. (#169528, Tomislav Jonjic)

2005-03-09  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkiconview.c (gtk_icon_view_set_model): Queue a resize
	when the model is unset.  (#169528, Tomislav Jonjic)

diff --git a/ChangeLog b/ChangeLog
index 6f303b0dd8dc29c765444111fdbbcf35f96ff28b..36b50407728db728f819290a042e4da2e7bac2ae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-09  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkiconview.c (gtk_icon_view_set_model): Queue a resize 
+       when the model is unset.  (#169528, Tomislav Jonjic)
+
 2005-03-09  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkviewport.c (gtk_viewport_class_init): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6f303b0dd8dc29c765444111fdbbcf35f96ff28b..36b50407728db728f819290a042e4da2e7bac2ae 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-03-09  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkiconview.c (gtk_icon_view_set_model): Queue a resize 
+       when the model is unset.  (#169528, Tomislav Jonjic)
+
 2005-03-09  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkviewport.c (gtk_viewport_class_init): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6f303b0dd8dc29c765444111fdbbcf35f96ff28b..36b50407728db728f819290a042e4da2e7bac2ae 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-03-09  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkiconview.c (gtk_icon_view_set_model): Queue a resize 
+       when the model is unset.  (#169528, Tomislav Jonjic)
+
 2005-03-09  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkviewport.c (gtk_viewport_class_init): 

diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index ba505c6375712b189ed19d73e253d566c034a13d..8fc55ca3287c0503038d8d5d1b36bd0c5ff8c822 100644 (file)
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -3234,6 +3234,8 @@ gtk_icon_view_set_model (GtkIconView *icon_view,
       icon_view->priv->anchor_item = NULL;
       icon_view->priv->cursor_item = NULL;
       icon_view->priv->last_single_clicked = NULL;
+      icon_view->priv->width = 0;
+      icon_view->priv->height = 0;
     }
 
   icon_view->priv->model = model;
@@ -3259,11 +3261,14 @@ gtk_icon_view_set_model (GtkIconView *icon_view,
                        icon_view);
 
       gtk_icon_view_build_items (icon_view);
-    }
 
-  gtk_icon_view_queue_layout (icon_view);
+      gtk_icon_view_queue_layout (icon_view);
+    }
 
   g_object_notify (G_OBJECT (icon_view), "model");  
+
+  if (GTK_WIDGET_REALIZED (icon_view))
+    gtk_widget_queue_resize (GTK_WIDGET (icon_view));
 }
 
 /**