set upper member of hadjustment correct, so the hscrollbars of lists

Mon Feb 11 17:54:46 2002  Kristian Rietveld  <kris@gtk.org>

        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): set upper
        member of hadjustment correct, so the hscrollbars of lists smaller
        than 1 page (in width) are somewhat saner

diff --git a/ChangeLog b/ChangeLog
index 9694fe9449ba5f60f524561b419eba62cf164adc..ece3d3723adde6d7821f54c9c7ff56224e65deb2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Feb 11 17:54:46 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_size_allocate): set upper
+       member of hadjustment correct, so the hscrollbars of lists smaller
+       than 1 page (in width) are somewhat saner
+
 2002-02-11  jacob berkman  <jacob@ximian.com>
 
        * gdk/gdkwindow.h (gdk_get_default_root_window): fix signature to

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 9694fe9449ba5f60f524561b419eba62cf164adc..ece3d3723adde6d7821f54c9c7ff56224e65deb2 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Mon Feb 11 17:54:46 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_size_allocate): set upper
+       member of hadjustment correct, so the hscrollbars of lists smaller
+       than 1 page (in width) are somewhat saner
+
 2002-02-11  jacob berkman  <jacob@ximian.com>
 
        * gdk/gdkwindow.h (gdk_get_default_root_window): fix signature to

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9694fe9449ba5f60f524561b419eba62cf164adc..ece3d3723adde6d7821f54c9c7ff56224e65deb2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Mon Feb 11 17:54:46 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_size_allocate): set upper
+       member of hadjustment correct, so the hscrollbars of lists smaller
+       than 1 page (in width) are somewhat saner
+
 2002-02-11  jacob berkman  <jacob@ximian.com>
 
        * gdk/gdkwindow.h (gdk_get_default_root_window): fix signature to

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 9694fe9449ba5f60f524561b419eba62cf164adc..ece3d3723adde6d7821f54c9c7ff56224e65deb2 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Mon Feb 11 17:54:46 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_size_allocate): set upper
+       member of hadjustment correct, so the hscrollbars of lists smaller
+       than 1 page (in width) are somewhat saner
+
 2002-02-11  jacob berkman  <jacob@ximian.com>
 
        * gdk/gdkwindow.h (gdk_get_default_root_window): fix signature to

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9694fe9449ba5f60f524561b419eba62cf164adc..ece3d3723adde6d7821f54c9c7ff56224e65deb2 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Mon Feb 11 17:54:46 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_size_allocate): set upper
+       member of hadjustment correct, so the hscrollbars of lists smaller
+       than 1 page (in width) are somewhat saner
+
 2002-02-11  jacob berkman  <jacob@ximian.com>
 
        * gdk/gdkwindow.h (gdk_get_default_root_window): fix signature to

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9694fe9449ba5f60f524561b419eba62cf164adc..ece3d3723adde6d7821f54c9c7ff56224e65deb2 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Mon Feb 11 17:54:46 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_size_allocate): set upper
+       member of hadjustment correct, so the hscrollbars of lists smaller
+       than 1 page (in width) are somewhat saner
+
 2002-02-11  jacob berkman  <jacob@ximian.com>
 
        * gdk/gdkwindow.h (gdk_get_default_root_window): fix signature to

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9694fe9449ba5f60f524561b419eba62cf164adc..ece3d3723adde6d7821f54c9c7ff56224e65deb2 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Mon Feb 11 17:54:46 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_size_allocate): set upper
+       member of hadjustment correct, so the hscrollbars of lists smaller
+       than 1 page (in width) are somewhat saner
+
 2002-02-11  jacob berkman  <jacob@ximian.com>
 
        * gdk/gdkwindow.h (gdk_get_default_root_window): fix signature to

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 9b772a4b780b2fb0239ebd8875cff00f2011d6d0..fcacd4eb1e51a995818b23fb678ff0bcdd5aabfb 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -1594,7 +1594,7 @@ gtk_tree_view_size_allocate (GtkWidget     *widget,
   tree_view->priv->hadjustment->page_increment = allocation->width;
   tree_view->priv->hadjustment->step_increment = allocation->width / 10;
   tree_view->priv->hadjustment->lower = 0;
-  tree_view->priv->hadjustment->upper = tree_view->priv->width;
+  tree_view->priv->hadjustment->upper = MAX (tree_view->priv->hadjustment->page_size, tree_view->priv->width);
 
   if (tree_view->priv->hadjustment->value + allocation->width > tree_view->priv->width)
     tree_view->priv->hadjustment->value = MAX (tree_view->priv->width - allocation->width, 0);