[gtk/wip/albfan/treeview-search-move] treeview: make the search move available
- From: Alberto Fanjul <albfan src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/albfan/treeview-search-move] treeview: make the search move available
- Date: Wed, 6 Nov 2019 07:45:45 +0000 (UTC)
commit 64a73864ef85c0b7a99ff4c103f50d3018d1498e
Author: Alberto Fanjul <albertofanjul gmail com>
Date: Wed Nov 6 08:26:57 2019 +0100
treeview: make the search move available
Allow to trigger the search and inspect the result
gtk/gtktreeview.c | 33 ++++++++++++++++++---------------
gtk/gtktreeview.h | 2 ++
2 files changed, 20 insertions(+), 15 deletions(-)
---
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 647d2e1440..45f0a46bc2 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -868,9 +868,6 @@ static gboolean gtk_tree_view_search_key_pressed (GtkEventControllerKey *
guint keycode,
GdkModifierType state,
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,
@@ -13942,9 +13939,9 @@ gtk_tree_view_search_scroll_event (GtkWidget *widget,
direction = dy > 0 ? GDK_SCROLL_DOWN : GDK_SCROLL_UP;
if (direction == GDK_SCROLL_UP)
- gtk_tree_view_search_move (widget, tree_view, TRUE);
+ gtk_tree_view_search_move (tree_view, TRUE);
else if (direction == GDK_SCROLL_DOWN)
- gtk_tree_view_search_move (widget, tree_view, FALSE);
+ gtk_tree_view_search_move (tree_view, FALSE);
/* renew the flush timeout */
if (tree_view->priv->typeselect_flush_timeout &&
@@ -13990,7 +13987,7 @@ gtk_tree_view_search_key_pressed (GtkEventControllerKey *key,
/* select previous matching iter */
if (keyval == GDK_KEY_Up || 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;
@@ -13999,7 +13996,7 @@ gtk_tree_view_search_key_pressed (GtkEventControllerKey *key,
if (((state & (default_accel | GDK_SHIFT_MASK)) == (default_accel | GDK_SHIFT_MASK))
&& (keyval == GDK_KEY_g || 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;
@@ -14008,7 +14005,7 @@ gtk_tree_view_search_key_pressed (GtkEventControllerKey *key,
/* select next matching iter */
if (keyval == GDK_KEY_Down || 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;
@@ -14017,7 +14014,7 @@ gtk_tree_view_search_key_pressed (GtkEventControllerKey *key,
if (((state & (default_accel | GDK_SHIFT_MASK)) == default_accel)
&& (keyval == GDK_KEY_g || 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;
@@ -14041,13 +14038,19 @@ gtk_tree_view_search_key_pressed (GtkEventControllerKey *key,
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 up)
+gboolean
+gtk_tree_view_search_move (GtkTreeView *tree_view,
+ gboolean up)
{
gboolean ret;
gint len;
diff --git a/gtk/gtktreeview.h b/gtk/gtktreeview.h
index 70c3e557ac..5bd926315d 100644
--- a/gtk/gtktreeview.h
+++ b/gtk/gtktreeview.h
@@ -381,6 +381,8 @@ void gtk_tree_view_set_search_position_func (GtkTreeVie
GtkTreeViewSearchPositionFunc func,
gpointer data,
GDestroyNotify destroy);
+gboolean gtk_tree_view_search_move (GtkTreeView *tree_view,
+ gboolean up);
/* Convert between the different coordinate systems */
GDK_AVAILABLE_IN_ALL
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]