From e02fe68aeb8bf95575313161bb720e255bd56c70 Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Sun, 19 Jun 2005 17:37:07 +0000 Subject: [PATCH] Make mousewheel scrolling possible in typeahead mode, suggestion from 2005-06-19 Kristian Rietveld Make mousewheel scrolling possible in typeahead mode, suggestion from Reinout van Schouwen (#307898). * gtk/gtktreeview.c (gtk_tree_view_ensure_interactive_directory): connect treeview search window to scroll_event signal, (gtk_tree_view_search_scroll_event): implement. --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ gtk/gtktreeview.c | 27 +++++++++++++++++++++++++++ 4 files changed, 54 insertions(+) diff --git a/ChangeLog b/ChangeLog index 3a944679a2..983d0b55f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2005-06-19 Kristian Rietveld + + Make mousewheel scrolling possible in typeahead mode, suggestion + from Reinout van Schouwen (#307898). + + * gtk/gtktreeview.c (gtk_tree_view_ensure_interactive_directory): + connect treeview search window to scroll_event signal, + (gtk_tree_view_search_scroll_event): implement. + 2005-06-19 Kristian Rietveld * gtk/gtktreeview.c (gtk_tree_view_search_button_press_event): pass diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3a944679a2..983d0b55f4 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +2005-06-19 Kristian Rietveld + + Make mousewheel scrolling possible in typeahead mode, suggestion + from Reinout van Schouwen (#307898). + + * gtk/gtktreeview.c (gtk_tree_view_ensure_interactive_directory): + connect treeview search window to scroll_event signal, + (gtk_tree_view_search_scroll_event): implement. + 2005-06-19 Kristian Rietveld * gtk/gtktreeview.c (gtk_tree_view_search_button_press_event): pass diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3a944679a2..983d0b55f4 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +2005-06-19 Kristian Rietveld + + Make mousewheel scrolling possible in typeahead mode, suggestion + from Reinout van Schouwen (#307898). + + * gtk/gtktreeview.c (gtk_tree_view_ensure_interactive_directory): + connect treeview search window to scroll_event signal, + (gtk_tree_view_search_scroll_event): implement. + 2005-06-19 Kristian Rietveld * gtk/gtktreeview.c (gtk_tree_view_search_button_press_event): pass diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 7a80fc9136..914624ce68 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -400,6 +400,9 @@ static gboolean gtk_tree_view_search_delete_event (GtkWidget *widge static gboolean gtk_tree_view_search_button_press_event (GtkWidget *widget, GdkEventButton *event, GtkTreeView *tree_view); +static gboolean gtk_tree_view_search_scroll_event (GtkWidget *entry, + GdkEventScroll *event, + GtkTreeView *tree_view); static gboolean gtk_tree_view_search_key_press_event (GtkWidget *entry, GdkEventKey *event, GtkTreeView *tree_view); @@ -9026,6 +9029,9 @@ gtk_tree_view_ensure_interactive_directory (GtkTreeView *tree_view) g_signal_connect (tree_view->priv->search_window, "button_press_event", G_CALLBACK (gtk_tree_view_search_button_press_event), tree_view); + g_signal_connect (tree_view->priv->search_window, "scroll_event", + G_CALLBACK (gtk_tree_view_search_scroll_event), + tree_view); frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN); @@ -12523,6 +12529,27 @@ gtk_tree_view_search_button_press_event (GtkWidget *widget, return TRUE; } +static gboolean +gtk_tree_view_search_scroll_event (GtkWidget *widget, + GdkEventScroll *event, + GtkTreeView *tree_view) +{ + gboolean retval = FALSE; + + if (event->direction == GDK_SCROLL_UP) + { + gtk_tree_view_search_move (widget, tree_view, TRUE); + retval = TRUE; + } + else if (event->direction == GDK_SCROLL_DOWN) + { + gtk_tree_view_search_move (widget, tree_view, FALSE); + retval = TRUE; + } + + return retval; +} + static gboolean gtk_tree_view_search_key_press_event (GtkWidget *widget, GdkEventKey *event,