summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2004-10-15 04:59:03 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2004-10-15 04:59:03 +0000
commitd0cc5dee2b41d6410a25caceb57d494fcdf25f0b (patch)
tree2c50ed873046403b332172a64e24b2b04116287b
parent091d8e28ea205c49daca72739c706f1d1eab5ce1 (diff)
downloadgdk-pixbuf-d0cc5dee2b41d6410a25caceb57d494fcdf25f0b.tar.gz
Restore the size info for the current row after measuring another row.
2004-10-15 Matthias Clasen <mclasen@redhat.com> * 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)
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.pre-2-106
-rw-r--r--ChangeLog.pre-2-66
-rw-r--r--ChangeLog.pre-2-86
-rw-r--r--gtk/gtkcellview.c3
5 files changed, 27 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c763a4fd4..e02db09c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-15 Matthias Clasen <mclasen@redhat.com>
+
+ * 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 <mclasen@redhat.com>
* gtk/gtkfilechooserdefault.c (shortcuts_remove_rows): Don't
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c763a4fd4..e02db09c0 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2004-10-15 Matthias Clasen <mclasen@redhat.com>
+
+ * 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 <mclasen@redhat.com>
* gtk/gtkfilechooserdefault.c (shortcuts_remove_rows): Don't
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c763a4fd4..e02db09c0 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2004-10-15 Matthias Clasen <mclasen@redhat.com>
+
+ * 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 <mclasen@redhat.com>
* gtk/gtkfilechooserdefault.c (shortcuts_remove_rows): Don't
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c763a4fd4..e02db09c0 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2004-10-15 Matthias Clasen <mclasen@redhat.com>
+
+ * 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 <mclasen@redhat.com>
* gtk/gtkfilechooserdefault.c (shortcuts_remove_rows): Don't
diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c
index dd4b747b1..08cf897ae 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;
}