gtk/gtkclist.c (adjust_adjustments) gtk/gtklayout.c

Mon Feb 18 14:17:59 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkclist.c (adjust_adjustments)
        * gtk/gtklayout.c (gtk_layout_size_allocate)
        * gtk/gtktextview.c (gtk_text_view_size_allocate)
        * gtk/gtktreeview.c (gtk_tree_view_size_allocate)
        * gtk/gtkviewport.c (gtk_viewport_size_allocate):
        Standardize on a page increment of page minus 1 line
        rather than half a page (#51027, Eric Fischer)

        * gtk/gtkviewport.c (gtk_viewport_size_allocate):
        Change step increment to be 0.1 * page_size height rather than
        a fixed 10 pixels.

5 files changed, 20 insertions, 14 deletions

diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index f831d153b5..9662624bbc 100644
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -6032,8 +6032,10 @@ adjust_adjustments (GtkCList *clist,
   if (clist->vadjustment)
     {
       clist->vadjustment->page_size = clist->clist_window_height;
-      clist->vadjustment->page_increment = clist->clist_window_height / 2;
       clist->vadjustment->step_increment = clist->row_height;
+      clist->vadjustment->page_increment =
+	MAX (clist->vadjustment->page_size - clist->vadjustment->step_increment,
+	     clist->vadjustment->page_size / 2);
       clist->vadjustment->lower = 0;
       clist->vadjustment->upper = LIST_HEIGHT (clist);
 
@@ -6051,8 +6053,10 @@ adjust_adjustments (GtkCList *clist,
   if (clist->hadjustment)
     {
       clist->hadjustment->page_size = clist->clist_window_width;
-      clist->hadjustment->page_increment = clist->clist_window_width / 2;
       clist->hadjustment->step_increment = 10;
+      clist->vadjustment->page_increment =
+	MAX (clist->vadjustment->page_size - clist->vadjustment->step_increment,
+	     clist->vadjustment->page_size / 2);
       clist->hadjustment->lower = 0;
       clist->hadjustment->upper = LIST_WIDTH (clist);
 
diff --git a/gtk/gtklayout.c b/gtk/gtklayout.c
index 8f3b60603d..6c56e7ae2a 100644
--- a/gtk/gtklayout.c
+++ b/gtk/gtklayout.c
@@ -1000,13 +1000,13 @@ gtk_layout_size_allocate (GtkWidget     *widget,
     }
 
   layout->hadjustment->page_size = allocation->width;
-  layout->hadjustment->page_increment = allocation->width / 2;
+  layout->hadjustment->page_increment = allocation->width * 0.9;
   layout->hadjustment->lower = 0;
   layout->hadjustment->upper = MAX (allocation->width, layout->width);
   gtk_signal_emit_by_name (GTK_OBJECT (layout->hadjustment), "changed");
 
   layout->vadjustment->page_size = allocation->height;
-  layout->vadjustment->page_increment = allocation->height / 2;
+  layout->vadjustment->page_increment = allocation->height * 0.9;
   layout->vadjustment->lower = 0;
   layout->vadjustment->upper = MAX (allocation->height, layout->height);
   gtk_signal_emit_by_name (GTK_OBJECT (layout->vadjustment), "changed");
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index f158456016..fc78372ddd 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -2925,14 +2925,16 @@ gtk_text_view_size_allocate (GtkWidget *widget,
     }
 
   text_view->hadjustment->page_size = SCREEN_WIDTH (text_view);
-  text_view->hadjustment->page_increment = SCREEN_WIDTH (text_view) / 2;
+  text_view->hadjustment->page_increment = SCREEN_WIDTH (text_view) * 0.9;
+  text_view->hadjustment->step_increment = SCREEN_WIDTH (text_view) * 0.1;
   text_view->hadjustment->lower = 0;
   text_view->hadjustment->upper = MAX (SCREEN_WIDTH (text_view),
                                        text_view->width);
   gtk_signal_emit_by_name (GTK_OBJECT (text_view->hadjustment), "changed");
 
   text_view->vadjustment->page_size = SCREEN_HEIGHT (text_view);
-  text_view->vadjustment->page_increment = SCREEN_HEIGHT (text_view) / 2;
+  text_view->vadjustment->page_increment = SCREEN_HEIGHT (text_view) * 0.9;
+  text_view->vadjustment->step_increment = SCREEN_HEIGHT (text_view) * 0.1;
   text_view->vadjustment->lower = 0;
   text_view->vadjustment->upper = MAX (SCREEN_HEIGHT (text_view),
                                        text_view->height);
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index b77a9cd96a..b41bc7963e 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -1592,8 +1592,8 @@ gtk_tree_view_size_allocate (GtkWidget     *widget,
 
 
   tree_view->priv->hadjustment->page_size = allocation->width;
-  tree_view->priv->hadjustment->page_increment = allocation->width;
-  tree_view->priv->hadjustment->step_increment = allocation->width / 10;
+  tree_view->priv->hadjustment->page_increment = allocation->width * 0.9;
+  tree_view->priv->hadjustment->step_increment = allocation->width * 0.1;
   tree_view->priv->hadjustment->lower = 0;
   tree_view->priv->hadjustment->upper = MAX (tree_view->priv->hadjustment->page_size, tree_view->priv->width);
 
@@ -1602,8 +1602,8 @@ gtk_tree_view_size_allocate (GtkWidget     *widget,
   gtk_adjustment_changed (tree_view->priv->hadjustment);
 
   tree_view->priv->vadjustment->page_size = allocation->height - TREE_VIEW_HEADER_HEIGHT (tree_view);
-  tree_view->priv->vadjustment->step_increment = (tree_view->priv->vadjustment->page_size) / 10;
-  tree_view->priv->vadjustment->page_increment = (allocation->height - TREE_VIEW_HEADER_HEIGHT (tree_view)) / 2;
+  tree_view->priv->vadjustment->step_increment = tree_view->priv->vadjustment->page_size * 0.1;
+  tree_view->priv->vadjustment->page_increment = tree_view->priv->vadjustment->page_size * 0.9;
   tree_view->priv->vadjustment->lower = 0;
   tree_view->priv->vadjustment->upper = MAX (tree_view->priv->vadjustment->page_size, tree_view->priv->height);
 
diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c
index 43aaebea3a..7aaf5593e4 100644
--- a/gtk/gtkviewport.c
+++ b/gtk/gtkviewport.c
@@ -705,12 +705,12 @@ gtk_viewport_size_allocate (GtkWidget     *widget,
     }
 
   viewport->hadjustment->page_size = child_allocation.width;
-  viewport->hadjustment->page_increment = viewport->hadjustment->page_size / 2;
-  viewport->hadjustment->step_increment = 10;
+  viewport->hadjustment->step_increment = child_allocation.width * 0.1;
+  viewport->hadjustment->page_increment = child_allocation.width * 0.9;
 
   viewport->vadjustment->page_size = child_allocation.height;
-  viewport->vadjustment->page_increment = viewport->vadjustment->page_size / 2;
-  viewport->vadjustment->step_increment = 10;
+  viewport->vadjustment->step_increment = child_allocation.height * 0.1;
+  viewport->vadjustment->page_increment = child_allocation.height * 0.9;
 
   hval = viewport->hadjustment->value;
   vval = viewport->vadjustment->value;