AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-12 05:20:17 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Owen Taylor 2002-02-18 19:20:31 +00:00 committed by Owen Taylor
parent 6f58c368d8
commit b2b29ea184
12 changed files with 118 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,3 +1,17 @@
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.
Mon Feb 18 12:31:52 2002 Owen Taylor <otaylor@redhat.com> Mon Feb 18 12:31:52 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontextsimple.c (gtk_im_context_simple_filter_keypress): * gtk/gtkimcontextsimple.c (gtk_im_context_simple_filter_keypress):

14
ChangeLog.pre-2-0
View File

@ -1,3 +1,17 @@
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.
Mon Feb 18 12:31:52 2002 Owen Taylor <otaylor@redhat.com> Mon Feb 18 12:31:52 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontextsimple.c (gtk_im_context_simple_filter_keypress): * gtk/gtkimcontextsimple.c (gtk_im_context_simple_filter_keypress):

14
ChangeLog.pre-2-10
View File

@ -1,3 +1,17 @@
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.
Mon Feb 18 12:31:52 2002 Owen Taylor <otaylor@redhat.com> Mon Feb 18 12:31:52 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontextsimple.c (gtk_im_context_simple_filter_keypress): * gtk/gtkimcontextsimple.c (gtk_im_context_simple_filter_keypress):

14
ChangeLog.pre-2-2
View File

@ -1,3 +1,17 @@
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.
Mon Feb 18 12:31:52 2002 Owen Taylor <otaylor@redhat.com> Mon Feb 18 12:31:52 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontextsimple.c (gtk_im_context_simple_filter_keypress): * gtk/gtkimcontextsimple.c (gtk_im_context_simple_filter_keypress):

14
ChangeLog.pre-2-4
View File

@ -1,3 +1,17 @@
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.
Mon Feb 18 12:31:52 2002 Owen Taylor <otaylor@redhat.com> Mon Feb 18 12:31:52 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontextsimple.c (gtk_im_context_simple_filter_keypress): * gtk/gtkimcontextsimple.c (gtk_im_context_simple_filter_keypress):

14
ChangeLog.pre-2-6
View File

@ -1,3 +1,17 @@
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.
Mon Feb 18 12:31:52 2002 Owen Taylor <otaylor@redhat.com> Mon Feb 18 12:31:52 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontextsimple.c (gtk_im_context_simple_filter_keypress): * gtk/gtkimcontextsimple.c (gtk_im_context_simple_filter_keypress):

14
ChangeLog.pre-2-8
View File

@ -1,3 +1,17 @@
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.
Mon Feb 18 12:31:52 2002 Owen Taylor <otaylor@redhat.com> Mon Feb 18 12:31:52 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontextsimple.c (gtk_im_context_simple_filter_keypress): * gtk/gtkimcontextsimple.c (gtk_im_context_simple_filter_keypress):

8
gtk/gtkclist.c
View File

@ -6032,8 +6032,10 @@ adjust_adjustments (GtkCList *clist,
if (clist->vadjustment) if (clist->vadjustment)
{ {
clist->vadjustment->page_size = clist->clist_window_height; 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->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->lower = 0;
clist->vadjustment->upper = LIST_HEIGHT (clist); clist->vadjustment->upper = LIST_HEIGHT (clist);
@ -6051,8 +6053,10 @@ adjust_adjustments (GtkCList *clist,
if (clist->hadjustment) if (clist->hadjustment)
{ {
clist->hadjustment->page_size = clist->clist_window_width; clist->hadjustment->page_size = clist->clist_window_width;
clist->hadjustment->page_increment = clist->clist_window_width / 2;
clist->hadjustment->step_increment = 10; 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->lower = 0;
clist->hadjustment->upper = LIST_WIDTH (clist); clist->hadjustment->upper = LIST_WIDTH (clist);

4
gtk/gtklayout.c
View File

@ -1000,13 +1000,13 @@ gtk_layout_size_allocate (GtkWidget *widget,
} }
layout->hadjustment->page_size = allocation->width; 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->lower = 0;
layout->hadjustment->upper = MAX (allocation->width, layout->width); layout->hadjustment->upper = MAX (allocation->width, layout->width);
gtk_signal_emit_by_name (GTK_OBJECT (layout->hadjustment), "changed"); gtk_signal_emit_by_name (GTK_OBJECT (layout->hadjustment), "changed");
layout->vadjustment->page_size = allocation->height; 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->lower = 0;
layout->vadjustment->upper = MAX (allocation->height, layout->height); layout->vadjustment->upper = MAX (allocation->height, layout->height);
gtk_signal_emit_by_name (GTK_OBJECT (layout->vadjustment), "changed"); gtk_signal_emit_by_name (GTK_OBJECT (layout->vadjustment), "changed");

6
gtk/gtktextview.c
View File

@ -2925,14 +2925,16 @@ gtk_text_view_size_allocate (GtkWidget *widget,
} }
text_view->hadjustment->page_size = SCREEN_WIDTH (text_view); 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->lower = 0;
text_view->hadjustment->upper = MAX (SCREEN_WIDTH (text_view), text_view->hadjustment->upper = MAX (SCREEN_WIDTH (text_view),
text_view->width); text_view->width);
gtk_signal_emit_by_name (GTK_OBJECT (text_view->hadjustment), "changed"); gtk_signal_emit_by_name (GTK_OBJECT (text_view->hadjustment), "changed");
text_view->vadjustment->page_size = SCREEN_HEIGHT (text_view); 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->lower = 0;
text_view->vadjustment->upper = MAX (SCREEN_HEIGHT (text_view), text_view->vadjustment->upper = MAX (SCREEN_HEIGHT (text_view),
text_view->height); text_view->height);

8
gtk/gtktreeview.c
View File

@ -1592,8 +1592,8 @@ gtk_tree_view_size_allocate (GtkWidget *widget,
tree_view->priv->hadjustment->page_size = allocation->width; tree_view->priv->hadjustment->page_size = allocation->width;
tree_view->priv->hadjustment->page_increment = allocation->width; tree_view->priv->hadjustment->page_increment = allocation->width * 0.9;
tree_view->priv->hadjustment->step_increment = allocation->width / 10; tree_view->priv->hadjustment->step_increment = allocation->width * 0.1;
tree_view->priv->hadjustment->lower = 0; tree_view->priv->hadjustment->lower = 0;
tree_view->priv->hadjustment->upper = MAX (tree_view->priv->hadjustment->page_size, tree_view->priv->width); 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); 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->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->step_increment = tree_view->priv->vadjustment->page_size * 0.1;
tree_view->priv->vadjustment->page_increment = (allocation->height - TREE_VIEW_HEADER_HEIGHT (tree_view)) / 2; tree_view->priv->vadjustment->page_increment = tree_view->priv->vadjustment->page_size * 0.9;
tree_view->priv->vadjustment->lower = 0; tree_view->priv->vadjustment->lower = 0;
tree_view->priv->vadjustment->upper = MAX (tree_view->priv->vadjustment->page_size, tree_view->priv->height); tree_view->priv->vadjustment->upper = MAX (tree_view->priv->vadjustment->page_size, tree_view->priv->height);

8
gtk/gtkviewport.c
View File

@ -705,12 +705,12 @@ gtk_viewport_size_allocate (GtkWidget *widget,
} }
viewport->hadjustment->page_size = child_allocation.width; viewport->hadjustment->page_size = child_allocation.width;
viewport->hadjustment->page_increment = viewport->hadjustment->page_size / 2; viewport->hadjustment->step_increment = child_allocation.width * 0.1;
viewport->hadjustment->step_increment = 10; viewport->hadjustment->page_increment = child_allocation.width * 0.9;
viewport->vadjustment->page_size = child_allocation.height; viewport->vadjustment->page_size = child_allocation.height;
viewport->vadjustment->page_increment = viewport->vadjustment->page_size / 2; viewport->vadjustment->step_increment = child_allocation.height * 0.1;
viewport->vadjustment->step_increment = 10; viewport->vadjustment->page_increment = child_allocation.height * 0.9;
hval = viewport->hadjustment->value; hval = viewport->hadjustment->value;
vval = viewport->vadjustment->value; vval = viewport->vadjustment->value;