diff --git a/ChangeLog b/ChangeLog index c763a4fd4d..e02db09c06 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-10-15 Matthias Clasen + + * gtk/gtkcellview.c (gtk_cell_view_get_size_of_row): Restore + the size info for the current row after measuring another + row. (#154945, William Jon McCann) + 2004-10-14 Matthias Clasen * gtk/gtkfilechooserdefault.c (shortcuts_remove_rows): Don't diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c763a4fd4d..e02db09c06 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2004-10-15 Matthias Clasen + + * gtk/gtkcellview.c (gtk_cell_view_get_size_of_row): Restore + the size info for the current row after measuring another + row. (#154945, William Jon McCann) + 2004-10-14 Matthias Clasen * gtk/gtkfilechooserdefault.c (shortcuts_remove_rows): Don't diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c763a4fd4d..e02db09c06 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2004-10-15 Matthias Clasen + + * gtk/gtkcellview.c (gtk_cell_view_get_size_of_row): Restore + the size info for the current row after measuring another + row. (#154945, William Jon McCann) + 2004-10-14 Matthias Clasen * gtk/gtkfilechooserdefault.c (shortcuts_remove_rows): Don't diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c763a4fd4d..e02db09c06 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2004-10-15 Matthias Clasen + + * gtk/gtkcellview.c (gtk_cell_view_get_size_of_row): Restore + the size info for the current row after measuring another + row. (#154945, William Jon McCann) + 2004-10-14 Matthias Clasen * gtk/gtkfilechooserdefault.c (shortcuts_remove_rows): Don't diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c index dd4b747b10..08cf897ae1 100644 --- a/gtk/gtkcellview.c +++ b/gtk/gtkcellview.c @@ -1055,6 +1055,9 @@ gtk_cell_view_get_size_of_row (GtkCellView *cell_view, gtk_tree_row_reference_free (cell_view->priv->displayed_row); cell_view->priv->displayed_row = tmp; + /* restore actual size info */ + gtk_cell_view_size_request (GTK_WIDGET (cell_view), &req); + return TRUE; }