(committed this again -- broken pipe and ChangeLog update)

Fri Feb  1 22:20:13 2002  Kristian Rietveld  <kris@gtk.org>

        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): use
        height - page_size not height - allocation->height (fixes #66269)

diff --git a/ChangeLog b/ChangeLog
index a32ef4c2add70658e52593b437a71c58876b34bd..cf93df6c2539c35d843b8aa5209cfd9624ded7ea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 Fri Feb  1 22:20:13 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): use
-       height - page_size not height - allocation->height
+       height - page_size not height - allocation->height (fixes #66269)
 
 Fri Feb  1 15:22:23 2002  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index a32ef4c2add70658e52593b437a71c58876b34bd..cf93df6c2539c35d843b8aa5209cfd9624ded7ea 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,7 +1,7 @@
 Fri Feb  1 22:20:13 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): use
-       height - page_size not height - allocation->height
+       height - page_size not height - allocation->height (fixes #66269)
 
 Fri Feb  1 15:22:23 2002  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a32ef4c2add70658e52593b437a71c58876b34bd..cf93df6c2539c35d843b8aa5209cfd9624ded7ea 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,7 +1,7 @@
 Fri Feb  1 22:20:13 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): use
-       height - page_size not height - allocation->height
+       height - page_size not height - allocation->height (fixes #66269)
 
 Fri Feb  1 15:22:23 2002  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index a32ef4c2add70658e52593b437a71c58876b34bd..cf93df6c2539c35d843b8aa5209cfd9624ded7ea 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,7 +1,7 @@
 Fri Feb  1 22:20:13 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): use
-       height - page_size not height - allocation->height
+       height - page_size not height - allocation->height (fixes #66269)
 
 Fri Feb  1 15:22:23 2002  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a32ef4c2add70658e52593b437a71c58876b34bd..cf93df6c2539c35d843b8aa5209cfd9624ded7ea 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,7 +1,7 @@
 Fri Feb  1 22:20:13 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): use
-       height - page_size not height - allocation->height
+       height - page_size not height - allocation->height (fixes #66269)
 
 Fri Feb  1 15:22:23 2002  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a32ef4c2add70658e52593b437a71c58876b34bd..cf93df6c2539c35d843b8aa5209cfd9624ded7ea 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,7 +1,7 @@
 Fri Feb  1 22:20:13 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): use
-       height - page_size not height - allocation->height
+       height - page_size not height - allocation->height (fixes #66269)
 
 Fri Feb  1 15:22:23 2002  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a32ef4c2add70658e52593b437a71c58876b34bd..cf93df6c2539c35d843b8aa5209cfd9624ded7ea 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,7 +1,7 @@
 Fri Feb  1 22:20:13 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): use
-       height - page_size not height - allocation->height
+       height - page_size not height - allocation->height (fixes #66269)
 
 Fri Feb  1 15:22:23 2002  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 5854332b20a5f408b38d73c323cc50d755a10c88..84d2f16a14964290a23a21481b96122627961899 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -1608,7 +1608,7 @@ gtk_tree_view_size_allocate (GtkWidget     *widget,
 
   if (tree_view->priv->vadjustment->value + allocation->height > tree_view->priv->height)
     gtk_adjustment_set_value (tree_view->priv->vadjustment,
-                             MAX (tree_view->priv->height - allocation->height, 0));
+                             MAX (tree_view->priv->height - tree_view->priv->vadjustment->page_size, 0));
   gtk_adjustment_changed (tree_view->priv->vadjustment);
   
   if (GTK_WIDGET_REALIZED (widget))