From 7ffcc59b5a36f04045f031201c9af3d15399cd8a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 13 Dec 2004 18:40:12 +0000 Subject: [PATCH] Implement scroll wheel scrolling for menus. (#88532) 2004-12-13 Matthias Clasen * gtk/gtkmenu.c (gtk_menu_scroll): Implement scroll wheel scrolling for menus. (#88532) --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ ChangeLog.pre-2-6 | 3 +++ ChangeLog.pre-2-8 | 3 +++ gtk/gtkmenu.c | 4 ++-- 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 25e4343154..bfdd7dccbd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-12-13 Matthias Clasen + * gtk/gtkmenu.c (gtk_menu_scroll): Implement scroll wheel scrolling + for menus. (#88532) + * gtk/gtkwindow.c (gtk_window_real_set_focus): Compare only the HAS_DEFAULT flags. (#160711, Tommi Komulainen) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 25e4343154..bfdd7dccbd 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2004-12-13 Matthias Clasen + * gtk/gtkmenu.c (gtk_menu_scroll): Implement scroll wheel scrolling + for menus. (#88532) + * gtk/gtkwindow.c (gtk_window_real_set_focus): Compare only the HAS_DEFAULT flags. (#160711, Tommi Komulainen) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 25e4343154..bfdd7dccbd 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,8 @@ 2004-12-13 Matthias Clasen + * gtk/gtkmenu.c (gtk_menu_scroll): Implement scroll wheel scrolling + for menus. (#88532) + * gtk/gtkwindow.c (gtk_window_real_set_focus): Compare only the HAS_DEFAULT flags. (#160711, Tommi Komulainen) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 25e4343154..bfdd7dccbd 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2004-12-13 Matthias Clasen + * gtk/gtkmenu.c (gtk_menu_scroll): Implement scroll wheel scrolling + for menus. (#88532) + * gtk/gtkwindow.c (gtk_window_real_set_focus): Compare only the HAS_DEFAULT flags. (#160711, Tommi Komulainen) diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index af9d65ebfe..71048e84a6 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -1714,7 +1714,7 @@ gtk_menu_set_tearoff_hints (GtkMenu *menu, geometry_hints.max_width = width; geometry_hints.min_height = 0; - geometry_hints.max_height = GTK_WIDGET (menu)->requisition.height + 10; + geometry_hints.max_height = GTK_WIDGET (menu)->requisition.height; gtk_window_set_geometry_hints (GTK_WINDOW (menu->tearoff_window), NULL, @@ -2840,7 +2840,7 @@ gtk_menu_scroll_by (GtkMenu *menu, gtk_menu_scroll_to (menu, offset); } -Static gboolean +static gboolean gtk_menu_scroll_timeout (gpointer data) { GtkMenu *menu;