set first_cell to FALSE after first iteration

Fri Mar  1 23:59:35 2002  Kristian Rietveld  <kris@gtk.org>

        * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_get_size): set
        first_cell to FALSE after first iteration

        * gtk/gtktreeview.c (validate_visible_area): reduce usage of
        GTK_RBNODE_GET_HEIGHT, check for node != NULL,
        (gtk_tree_view_top_row_to_dy): remove call to gtk_adjustment_changed
        (gtk_tree_view_search_iter): select iter after scrolling

diff --git a/ChangeLog b/ChangeLog
index 5a80e43bb05e7e55edcddddc2f15af38aedac910..b9902421534c21f3cb06c272306a3b0a8106e4dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Fri Mar  1 23:59:35 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_get_size): set
+       first_cell to FALSE after first iteration
+
+       * gtk/gtktreeview.c (validate_visible_area): reduce usage of
+       GTK_RBNODE_GET_HEIGHT, check for node != NULL,
+       (gtk_tree_view_top_row_to_dy): remove call to gtk_adjustment_changed
+       (gtk_tree_view_search_iter): select iter after scrolling
+
 2002-03-02  Tor Lillqvist  <tml@iki.fi>
 
        * gtk/gtkitemfactory.c: Remove unneeded Win32 stuff inside #ifdef

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 5a80e43bb05e7e55edcddddc2f15af38aedac910..b9902421534c21f3cb06c272306a3b0a8106e4dd 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,13 @@
+Fri Mar  1 23:59:35 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_get_size): set
+       first_cell to FALSE after first iteration
+
+       * gtk/gtktreeview.c (validate_visible_area): reduce usage of
+       GTK_RBNODE_GET_HEIGHT, check for node != NULL,
+       (gtk_tree_view_top_row_to_dy): remove call to gtk_adjustment_changed
+       (gtk_tree_view_search_iter): select iter after scrolling
+
 2002-03-02  Tor Lillqvist  <tml@iki.fi>
 
        * gtk/gtkitemfactory.c: Remove unneeded Win32 stuff inside #ifdef

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5a80e43bb05e7e55edcddddc2f15af38aedac910..b9902421534c21f3cb06c272306a3b0a8106e4dd 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+Fri Mar  1 23:59:35 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_get_size): set
+       first_cell to FALSE after first iteration
+
+       * gtk/gtktreeview.c (validate_visible_area): reduce usage of
+       GTK_RBNODE_GET_HEIGHT, check for node != NULL,
+       (gtk_tree_view_top_row_to_dy): remove call to gtk_adjustment_changed
+       (gtk_tree_view_search_iter): select iter after scrolling
+
 2002-03-02  Tor Lillqvist  <tml@iki.fi>
 
        * gtk/gtkitemfactory.c: Remove unneeded Win32 stuff inside #ifdef

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 5a80e43bb05e7e55edcddddc2f15af38aedac910..b9902421534c21f3cb06c272306a3b0a8106e4dd 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,13 @@
+Fri Mar  1 23:59:35 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_get_size): set
+       first_cell to FALSE after first iteration
+
+       * gtk/gtktreeview.c (validate_visible_area): reduce usage of
+       GTK_RBNODE_GET_HEIGHT, check for node != NULL,
+       (gtk_tree_view_top_row_to_dy): remove call to gtk_adjustment_changed
+       (gtk_tree_view_search_iter): select iter after scrolling
+
 2002-03-02  Tor Lillqvist  <tml@iki.fi>
 
        * gtk/gtkitemfactory.c: Remove unneeded Win32 stuff inside #ifdef

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 5a80e43bb05e7e55edcddddc2f15af38aedac910..b9902421534c21f3cb06c272306a3b0a8106e4dd 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,13 @@
+Fri Mar  1 23:59:35 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_get_size): set
+       first_cell to FALSE after first iteration
+
+       * gtk/gtktreeview.c (validate_visible_area): reduce usage of
+       GTK_RBNODE_GET_HEIGHT, check for node != NULL,
+       (gtk_tree_view_top_row_to_dy): remove call to gtk_adjustment_changed
+       (gtk_tree_view_search_iter): select iter after scrolling
+
 2002-03-02  Tor Lillqvist  <tml@iki.fi>
 
        * gtk/gtkitemfactory.c: Remove unneeded Win32 stuff inside #ifdef

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5a80e43bb05e7e55edcddddc2f15af38aedac910..b9902421534c21f3cb06c272306a3b0a8106e4dd 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,13 @@
+Fri Mar  1 23:59:35 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_get_size): set
+       first_cell to FALSE after first iteration
+
+       * gtk/gtktreeview.c (validate_visible_area): reduce usage of
+       GTK_RBNODE_GET_HEIGHT, check for node != NULL,
+       (gtk_tree_view_top_row_to_dy): remove call to gtk_adjustment_changed
+       (gtk_tree_view_search_iter): select iter after scrolling
+
 2002-03-02  Tor Lillqvist  <tml@iki.fi>
 
        * gtk/gtkitemfactory.c: Remove unneeded Win32 stuff inside #ifdef

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5a80e43bb05e7e55edcddddc2f15af38aedac910..b9902421534c21f3cb06c272306a3b0a8106e4dd 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+Fri Mar  1 23:59:35 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_get_size): set
+       first_cell to FALSE after first iteration
+
+       * gtk/gtktreeview.c (validate_visible_area): reduce usage of
+       GTK_RBNODE_GET_HEIGHT, check for node != NULL,
+       (gtk_tree_view_top_row_to_dy): remove call to gtk_adjustment_changed
+       (gtk_tree_view_search_iter): select iter after scrolling
+
 2002-03-02  Tor Lillqvist  <tml@iki.fi>
 
        * gtk/gtkitemfactory.c: Remove unneeded Win32 stuff inside #ifdef

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index aae16f59241799e5c8b5e1950829c26130d4587c..33224ef8029a4225697cae1bc2ccd95365830e1d 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -3690,9 +3690,10 @@ validate_visible_area (GtkTreeView *tree_view)
            }
          if (tree_view->priv->scroll_to_use_align)
            {
-             area_above = (total_height - MAX (GTK_RBNODE_GET_HEIGHT (node), tree_view->priv->expander_size)) *
+             gint height = MAX (GTK_RBNODE_GET_HEIGHT (node), tree_view->priv->expander_size);
+             area_above = (total_height - height) *
                tree_view->priv->scroll_to_row_align;
-             area_below = total_height - MAX (GTK_RBNODE_GET_HEIGHT (node), tree_view->priv->expander_size) - area_above;
+             area_below = total_height - height - area_above;
              area_above = MAX (area_above, 0);
              area_below = MAX (area_below, 0);
            }
@@ -3851,7 +3852,7 @@ validate_visible_area (GtkTreeView *tree_view)
       area_above -= MAX (GTK_RBNODE_GET_HEIGHT (node), tree_view->priv->expander_size);
 
       _gtk_rbtree_prev_full (tree, node, &tree, &node);
-      if (! gtk_tree_path_prev (above_path))
+      if (! gtk_tree_path_prev (above_path) && node)
        {
          gtk_tree_path_free (above_path);
          above_path = _gtk_tree_view_find_path (tree_view, tree, node);
@@ -4112,7 +4113,6 @@ gtk_tree_view_top_row_to_dy (GtkTreeView *tree_view)
   tree_view->priv->dy += tree_view->priv->top_row_dy;
   gtk_adjustment_set_value (tree_view->priv->vadjustment,
                            tree_view->priv->dy);
-  gtk_adjustment_changed (tree_view->priv->vadjustment);
 }
 
 void
@@ -10213,9 +10213,9 @@ gtk_tree_view_search_iter (GtkTreeModel     *model,
           (*count)++;
           if (*count == n)
             {
-              gtk_tree_selection_select_iter (selection, iter);
               gtk_tree_view_scroll_to_cell (tree_view, path, column,
                                            TRUE, 0.5, 0.5);
+              gtk_tree_selection_select_iter (selection, iter);
              gtk_tree_view_real_set_cursor (tree_view, path, FALSE);
 
              if (path)

diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 04a71daaf2acf58d63d7934ce00cb91e3983cff8..fb6d453a98b58c6ee084ebccaed8123de25b4544 100644 (file)
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -2248,7 +2248,7 @@ gtk_tree_view_column_cell_get_size (GtkTreeViewColumn *tree_column,
       info->requested_width = MAX (info->requested_width, new_width + focus_line_width * 2);
       if (width)
        * width += info->requested_width;
-      first_cell = TRUE;
+      first_cell = FALSE;
     }
 }