diff options
| author | Alberto Fanjul <albertofanjul@gmail.com> | 2019-11-06 18:55:06 +0100 |
|---|---|---|
| committer | Alberto Fanjul <albertofanjul@gmail.com> | 2019-11-10 11:37:49 +0100 |
| commit | e412ad78c1bde898b0e5af2924d3482a19fea322 (patch) | |
| tree | a05c68ed88831865a52e20416ce820a65786b767 | |
| parent | 759ee31b0c5b6ce6283f8646d222fee70639f99d (diff) | |
| download | gtk+-wip/albfan/treeview-search-move.tar.gz | |
treeview: make the search move availablewip/albfan/treeview-search-move
Allow to trigger the search and inspect the result
| -rw-r--r-- | gtk/gtktreeview.c | 31 | ||||
| -rw-r--r-- | gtk/gtktreeview.h | 3 |
2 files changed, 20 insertions, 14 deletions
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 1407a8e96a..df6129cef3 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -838,9 +838,6 @@ static gboolean gtk_tree_view_search_scroll_event (GtkWidget *entry static gboolean gtk_tree_view_search_key_press_event (GtkWidget *entry, GdkEventKey *event, GtkTreeView *tree_view); -static gboolean gtk_tree_view_search_move (GtkWidget *window, - GtkTreeView *tree_view, - gboolean up); static gboolean gtk_tree_view_search_equal_func (GtkTreeModel *model, gint column, const gchar *key, @@ -15297,12 +15294,12 @@ gtk_tree_view_search_scroll_event (GtkWidget *widget, if (event->direction == GDK_SCROLL_UP) { - gtk_tree_view_search_move (widget, tree_view, TRUE); + gtk_tree_view_search_move (tree_view, TRUE); retval = TRUE; } else if (event->direction == GDK_SCROLL_DOWN) { - gtk_tree_view_search_move (widget, tree_view, FALSE); + gtk_tree_view_search_move (tree_view, FALSE); retval = TRUE; } @@ -15347,7 +15344,7 @@ gtk_tree_view_search_key_press_event (GtkWidget *widget, /* select previous matching iter */ if (event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_KP_Up) { - if (!gtk_tree_view_search_move (widget, tree_view, TRUE)) + if (!gtk_tree_view_search_move (tree_view, TRUE)) gtk_widget_error_bell (widget); retval = TRUE; @@ -15356,7 +15353,7 @@ gtk_tree_view_search_key_press_event (GtkWidget *widget, if (((event->state & (default_accel | GDK_SHIFT_MASK)) == (default_accel | GDK_SHIFT_MASK)) && (event->keyval == GDK_KEY_g || event->keyval == GDK_KEY_G)) { - if (!gtk_tree_view_search_move (widget, tree_view, TRUE)) + if (!gtk_tree_view_search_move (tree_view, TRUE)) gtk_widget_error_bell (widget); retval = TRUE; @@ -15365,7 +15362,7 @@ gtk_tree_view_search_key_press_event (GtkWidget *widget, /* select next matching iter */ if (event->keyval == GDK_KEY_Down || event->keyval == GDK_KEY_KP_Down) { - if (!gtk_tree_view_search_move (widget, tree_view, FALSE)) + if (!gtk_tree_view_search_move (tree_view, FALSE)) gtk_widget_error_bell (widget); retval = TRUE; @@ -15374,7 +15371,7 @@ gtk_tree_view_search_key_press_event (GtkWidget *widget, if (((event->state & (default_accel | GDK_SHIFT_MASK)) == default_accel) && (event->keyval == GDK_KEY_g || event->keyval == GDK_KEY_G)) { - if (!gtk_tree_view_search_move (widget, tree_view, FALSE)) + if (!gtk_tree_view_search_move (tree_view, FALSE)) gtk_widget_error_bell (widget); retval = TRUE; @@ -15395,12 +15392,18 @@ gtk_tree_view_search_key_press_event (GtkWidget *widget, return retval; } -/* this function returns FALSE if there is a search string but - * nothing was found, and TRUE otherwise. +/** + * gtk_tree_search_move: + * @tree_view: a #GtkTreeView + * @up: TRUE if move goes up, FALSE if move goes down + * + * Creates a new #GtkTreeView widget. + * + * Returns: FALSE if there is a search string but nothing was found, + * and TRUE otherwise. */ -static gboolean -gtk_tree_view_search_move (GtkWidget *window, - GtkTreeView *tree_view, +gboolean +gtk_tree_view_search_move (GtkTreeView *tree_view, gboolean up) { gboolean ret; diff --git a/gtk/gtktreeview.h b/gtk/gtktreeview.h index c3233b4f52..b064d84f31 100644 --- a/gtk/gtktreeview.h +++ b/gtk/gtktreeview.h @@ -465,6 +465,9 @@ void gtk_tree_view_set_search_position_func (GtkTreeVie GtkTreeViewSearchPositionFunc func, gpointer data, GDestroyNotify destroy); +GDK_AVAILABLE_IN_ALL +gboolean gtk_tree_view_search_move (GtkTreeView *tree_view, + gboolean up); /* Convert between the different coordinate systems */ GDK_AVAILABLE_IN_ALL |