callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge from stable.

Browse Source 
Wed Sep  3 23:18:17 2003  Kristian Rietveld  <kris@gtk.org>

	Merge from stable.

	* gtk/gtkmenu.c (gtk_menu_real_move_scroll): for the END case,
	use end_position - page_size instead of G_MAXINT, since
	gtk_menu_scroll_to doesn't CLAMP anymore internally. (Fixes #121237,
	reported by Havoc Pennington).
This commit is contained in:
Kristian Rietveld 2003-09-03 21:26:13 +00:00 committed by Kristian Rietveld
parent 0089371123
commit bc61e7233b
6 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Wed Sep 3 23:18:17 2003 Kristian Rietveld <kris@gtk.org>
Merge from stable.
* gtk/gtkmenu.c (gtk_menu_real_move_scroll): for the END case,
use end_position - page_size instead of G_MAXINT, since
gtk_menu_scroll_to doesn't CLAMP anymore internally. (Fixes #121237,
reported by Havoc Pennington).
Wed Sep 3 21:58:03 2003 Kristian Rietveld <kris@gtk.org> Wed Sep 3 21:58:03 2003 Kristian Rietveld <kris@gtk.org>
Merge from stable. Merge from stable.

9
ChangeLog.pre-2-10
View File

@ -1,3 +1,12 @@
Wed Sep 3 23:18:17 2003 Kristian Rietveld <kris@gtk.org>
Merge from stable.
* gtk/gtkmenu.c (gtk_menu_real_move_scroll): for the END case,
use end_position - page_size instead of G_MAXINT, since
gtk_menu_scroll_to doesn't CLAMP anymore internally. (Fixes #121237,
reported by Havoc Pennington).
Wed Sep 3 21:58:03 2003 Kristian Rietveld <kris@gtk.org> Wed Sep 3 21:58:03 2003 Kristian Rietveld <kris@gtk.org>
Merge from stable. Merge from stable.

9
ChangeLog.pre-2-4
View File

@ -1,3 +1,12 @@
Wed Sep 3 23:18:17 2003 Kristian Rietveld <kris@gtk.org>
Merge from stable.
* gtk/gtkmenu.c (gtk_menu_real_move_scroll): for the END case,
use end_position - page_size instead of G_MAXINT, since
gtk_menu_scroll_to doesn't CLAMP anymore internally. (Fixes #121237,
reported by Havoc Pennington).
Wed Sep 3 21:58:03 2003 Kristian Rietveld <kris@gtk.org> Wed Sep 3 21:58:03 2003 Kristian Rietveld <kris@gtk.org>
Merge from stable. Merge from stable.

9
ChangeLog.pre-2-6
View File

@ -1,3 +1,12 @@
Wed Sep 3 23:18:17 2003 Kristian Rietveld <kris@gtk.org>
Merge from stable.
* gtk/gtkmenu.c (gtk_menu_real_move_scroll): for the END case,
use end_position - page_size instead of G_MAXINT, since
gtk_menu_scroll_to doesn't CLAMP anymore internally. (Fixes #121237,
reported by Havoc Pennington).
Wed Sep 3 21:58:03 2003 Kristian Rietveld <kris@gtk.org> Wed Sep 3 21:58:03 2003 Kristian Rietveld <kris@gtk.org>
Merge from stable. Merge from stable.

9
ChangeLog.pre-2-8
View File

@ -1,3 +1,12 @@
Wed Sep 3 23:18:17 2003 Kristian Rietveld <kris@gtk.org>
Merge from stable.
* gtk/gtkmenu.c (gtk_menu_real_move_scroll): for the END case,
use end_position - page_size instead of G_MAXINT, since
gtk_menu_scroll_to doesn't CLAMP anymore internally. (Fixes #121237,
reported by Havoc Pennington).
Wed Sep 3 21:58:03 2003 Kristian Rietveld <kris@gtk.org> Wed Sep 3 21:58:03 2003 Kristian Rietveld <kris@gtk.org>
Merge from stable. Merge from stable.

7
gtk/gtkmenu.c
View File

@ -3376,6 +3376,8 @@ static void
gtk_menu_real_move_scroll (GtkMenu *menu, gtk_menu_real_move_scroll (GtkMenu *menu,
GtkScrollType type) GtkScrollType type)
{ {
gint page_size = get_visible_size (menu);
gint end_position = get_menu_height (menu);
GtkMenuShell *menu_shell = GTK_MENU_SHELL (menu); GtkMenuShell *menu_shell = GTK_MENU_SHELL (menu);
switch (type) switch (type)
@ -3383,7 +3385,6 @@ gtk_menu_real_move_scroll (GtkMenu *menu,
case GTK_SCROLL_PAGE_UP: case GTK_SCROLL_PAGE_UP:
case GTK_SCROLL_PAGE_DOWN: case GTK_SCROLL_PAGE_DOWN:
{ {
gint page_size = get_visible_size (menu);
gint old_offset; gint old_offset;
gint new_offset; gint new_offset;
gint child_offset = 0; gint child_offset = 0;
@ -3409,7 +3410,7 @@ gtk_menu_real_move_scroll (GtkMenu *menu,
old_offset = menu->scroll_offset; old_offset = menu->scroll_offset;
new_offset = menu->scroll_offset + step; new_offset = menu->scroll_offset + step;
new_offset = CLAMP (new_offset, 0, get_menu_height (menu) - page_size); new_offset = CLAMP (new_offset, 0, end_position - page_size);
gtk_menu_scroll_to (menu, new_offset); gtk_menu_scroll_to (menu, new_offset);
@ -3440,7 +3441,7 @@ gtk_menu_real_move_scroll (GtkMenu *menu,
/* Ignore the enter event we might get if the pointer is on the menu /* Ignore the enter event we might get if the pointer is on the menu
*/ */
menu_shell->ignore_enter = TRUE; menu_shell->ignore_enter = TRUE;
gtk_menu_scroll_to (menu, G_MAXINT); gtk_menu_scroll_to (menu, end_position - page_size);
_gtk_menu_shell_select_last (menu_shell, TRUE); _gtk_menu_shell_select_last (menu_shell, TRUE);
break; break;
default: default: