From: Jonathan Blandford <jrb@redhat.com>
Date: Fri, 2 Apr 2004 23:07:49 +0000 (+0000)
Subject: set the height correctly for fixed height when inserting a node, #138082
X-Git-Url: http://pileus.org/git/?p=~andy%2Fgtk;a=commitdiff_plain;h=277bfffe38f93ab9281982233d31cf1e0e221b3b

set the height correctly for fixed height when inserting a node, #138082

Fri Apr  2 17:57:33 2004  Jonathan Blandford  <jrb@redhat.com>

        * gtk/gtktreeview.c (gtk_tree_view_row_inserted): set the height
        correctly for fixed height when inserting a node, #138082
---

diff --git a/ChangeLog b/ChangeLog
index d68a8ba95..df8bfa3bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Apr  2 17:57:33 2004  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_row_inserted): set the height
+	correctly for fixed height when inserting a node, #138082
+
 2004-04-01  Federico Mena Quintero  <federico@ximian.com>
 
 	Fix #136077.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d68a8ba95..df8bfa3bf 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Fri Apr  2 17:57:33 2004  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_row_inserted): set the height
+	correctly for fixed height when inserting a node, #138082
+
 2004-04-01  Federico Mena Quintero  <federico@ximian.com>
 
 	Fix #136077.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d68a8ba95..df8bfa3bf 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Fri Apr  2 17:57:33 2004  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_row_inserted): set the height
+	correctly for fixed height when inserting a node, #138082
+
 2004-04-01  Federico Mena Quintero  <federico@ximian.com>
 
 	Fix #136077.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d68a8ba95..df8bfa3bf 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Fri Apr  2 17:57:33 2004  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_row_inserted): set the height
+	correctly for fixed height when inserting a node, #138082
+
 2004-04-01  Federico Mena Quintero  <federico@ximian.com>
 
 	Fix #136077.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d68a8ba95..df8bfa3bf 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Fri Apr  2 17:57:33 2004  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_row_inserted): set the height
+	correctly for fixed height when inserting a node, #138082
+
 2004-04-01  Federico Mena Quintero  <federico@ximian.com>
 
 	Fix #136077.
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 951c2f982..ed7503514 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -6665,6 +6665,7 @@ gtk_tree_view_row_inserted (GtkTreeModel *model,
   GtkRBNode *tmpnode = NULL;
   gint depth;
   gint i = 0;
+  gint height;
   gboolean free_path = FALSE;
 
   g_return_if_fail (path != NULL || iter != NULL);
@@ -6726,22 +6727,24 @@ gtk_tree_view_row_inserted (GtkTreeModel *model,
   if (tree == NULL)
     goto done;
 
+  if (tree_view->priv->fixed_height_mode
+      && tree_view->priv->fixed_height >= 0)
+    height = tree_view->priv->fixed_height;
+  else
+    height = 0;
+
   /* ref the node */
   gtk_tree_model_ref_node (tree_view->priv->model, iter);
   if (indices[depth - 1] == 0)
     {
       tmpnode = _gtk_rbtree_find_count (tree, 1);
-      _gtk_rbtree_insert_before (tree, tmpnode, 0, FALSE);
+      _gtk_rbtree_insert_before (tree, tmpnode, height, FALSE);
     }
   else
     {
       tmpnode = _gtk_rbtree_find_count (tree, indices[depth - 1]);
-      _gtk_rbtree_insert_after (tree, tmpnode, 0, FALSE);
-    }
-
-  if (tree_view->priv->fixed_height_mode
-      && tree_view->priv->fixed_height >= 0)
-    _gtk_rbtree_node_set_height (tree, tmpnode, tree_view->priv->fixed_height);
+      _gtk_rbtree_insert_after (tree, tmpnode, height, FALSE);
+    } 
 
  done:
   install_presize_handler (tree_view);