Make mousewheel scrolling possible in typeahead mode, suggestion from

2005-06-19  Kristian Rietveld  <kris@gtk.org>

	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.

diff --git a/ChangeLog b/ChangeLog
index 3a944679a2510d15c638052d1d0d1ea24958c491..983d0b55f4490f02150eb23eccbef554f457370b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-06-19  Kristian Rietveld  <kris@gtk.org>
+
+       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  <kris@gtk.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_search_button_press_event): pass

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3a944679a2510d15c638052d1d0d1ea24958c491..983d0b55f4490f02150eb23eccbef554f457370b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2005-06-19  Kristian Rietveld  <kris@gtk.org>
+
+       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  <kris@gtk.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_search_button_press_event): pass

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3a944679a2510d15c638052d1d0d1ea24958c491..983d0b55f4490f02150eb23eccbef554f457370b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+2005-06-19  Kristian Rietveld  <kris@gtk.org>
+
+       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  <kris@gtk.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_search_button_press_event): pass

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 7a80fc91360368c9ef790aeeeb2ce569f46a3d5f..914624ce6861e8a97dce768fdf94c3c74b802e04 100644 (file)
--- 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,